← Back to branch summary

~landscape/landscape-client/trunk

« back to all changes in this revision

Viewing changes to landscape/broker/server.py

Merge fix-landscape-client-startup [f=1180584] [r=ack,free.ekanayaka] [a=Christopher Armstrong]
Get rid of implicit population of the components registry; it's now explicitly created in a function, and used directly when it's needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
landscape/broker/server.py
3
3
from twisted.internet.defer import Deferred
4
4
 
5
5
from landscape.lib.twisted_util import gather_results
6
 
from landscape.amp import ComponentsRegistry
 
6
from landscape.amp import remote
7
7
from landscape.manager.manager import FAILED
8
 
from landscape.amp import remote
9
8
 
10
9
 
11
10
def event(method):
38
37
    @param message_store: The broker's L{MessageStore}.
39
38
    """
40
39
    name = "broker"
41
 
    connectors_registry = ComponentsRegistry
42
40
 
43
41
    def __init__(self, config, reactor, exchange, registration,
44
42
                 message_store, pinger):
 
43
        from landscape.broker.amp import get_component_registry
 
44
        self.connectors_registry = get_component_registry()
45
45
        self._config = config
46
46
        self._reactor = reactor
47
47
        self._exchanger = exchange