afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

daemon: Use a set to store broker handlers.

Browse source
This commit is contained in:
Tom Goff 2016-10-12 15:55:30 +00:00
parent bcd749578d
commit 31a9f6fb34
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
daemon/core/broker.py
View file

@ -54,7 +54,7 @@ class CoreBroker(ConfigurableManager):
# list of node numbers that are PhysicalNode nodes # list of node numbers that are PhysicalNode nodes
self.phys = [] self.phys = []
# allows for other message handlers to process API messages (e.g. EMANE) # allows for other message handlers to process API messages (e.g. EMANE)
self.handlers = () self.handlers = set()
# dict with tunnel key to tunnel device mapping # dict with tunnel key to tunnel device mapping
self.tunnels = {} self.tunnels = {}
self.dorecvloop = False self.dorecvloop = False

2
daemon/core/emane/emane.py
View file

@ -67,7 +67,7 @@ class Emane(ConfigurableManager):
self.logversion() self.logversion()
# model for global EMANE configuration options # model for global EMANE configuration options
self.emane_config = EmaneGlobalModel(session, None, self.verbose) self.emane_config = EmaneGlobalModel(session, None, self.verbose)
session.broker.handlers += (self.handledistributed, ) session.broker.handlers.add(self.handledistributed)
self.loadmodels() self.loadmodels()
self.service = None self.service = None

2
daemon/core/mobility.py
View file

@ -33,7 +33,7 @@ class MobilityManager(ConfigurableManager):
# dummy node objects for tracking position of nodes on other servers # dummy node objects for tracking position of nodes on other servers
self.phys = {} self.phys = {}
self.physnets = {} self.physnets = {}
self.session.broker.handlers += (self.physnodehandlelink, ) self.session.broker.handlers.add(self.physnodehandlelink)
self.register() self.register()
def startup(self, nodenums=None): def startup(self, nodenums=None):

2
daemon/core/sdt.py
View file

@ -50,7 +50,7 @@ class Sdt(object):
# node information for remote nodes not in session._objs # node information for remote nodes not in session._objs
# local nodes also appear here since their obj may not exist yet # local nodes also appear here since their obj may not exist yet
self.remotes = {} self.remotes = {}
session.broker.handlers += (self.handledistributed, ) session.broker.handlers.add(self.handledistributed)
def is_enabled(self): def is_enabled(self):
''' Check for 'enablesdt' session option. Return False by default if ''' Check for 'enablesdt' session option. Return False by default if

2
daemon/core/session.py
View file

@ -1132,7 +1132,7 @@ class SessionConfig(ConfigurableManager, Configurable):
def __init__(self, session): def __init__(self, session):
ConfigurableManager.__init__(self, session) ConfigurableManager.__init__(self, session)
session.broker.handlers += (self.handledistributed, ) session.broker.handlers.add(self.handledistributed)
self.reset() self.reset()
def reset(self): def reset(self):