diff options
| -rw-r--r-- | obmc/mapper/server.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/obmc/mapper/server.py b/obmc/mapper/server.py index d18c609..785d91d 100644 --- a/obmc/mapper/server.py +++ b/obmc/mapper/server.py @@ -205,9 +205,10 @@ class ObjectMapper(dbus.service.Object): self.service = None self.index = {} self.manager = Manager(bus, obmc.dbuslib.bindings.OBJ_PREFIX) + self.unique = bus.get_unique_name() self.bus_map = {} self.defer_signals = {} - self.bus_map[bus.get_unique_name()] = obmc.mapper.MAPPER_NAME + self.bus_map[self.unique] = obmc.mapper.MAPPER_NAME self.namespaces = namespaces self.interface_namespaces = interface_namespaces self.blacklist = blacklist @@ -215,8 +216,7 @@ class ObjectMapper(dbus.service.Object): self.interface_blacklist = interface_blacklist # add my object mananger instance - self.add_new_objmgr( - obmc.dbuslib.bindings.OBJ_PREFIX, obmc.mapper.MAPPER_NAME) + self.add_new_objmgr(obmc.dbuslib.bindings.OBJ_PREFIX, self.unique) self.bus.add_signal_receiver( self.bus_handler, @@ -480,10 +480,10 @@ class ObjectMapper(dbus.service.Object): for owned_name, o in owners: if not self.valid_signal(owned_name): continue - self.bus_map[owned_name] = o - self.defer_signals[owned_name] = [] + self.bus_map[o] = owned_name + self.defer_signals[o] = [] find_dbus_interfaces( - self.bus, owned_name, '/', + self.bus, o, '/', self.discovery_callback, self.discovery_error, subtree_match=self.path_match, @@ -676,7 +676,7 @@ class ObjectMapper(dbus.service.Object): if create != delete: self.update_interfaces( - path, obmc.mapper.MAPPER_NAME, delete, create) + path, self.unique, delete, create) def update_associations( self, path, owner, old, new, created=[], destroyed=[]): |
