diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2017-10-25 15:44:06 -0400 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2017-12-15 05:16:59 +0000 |
| commit | 799e7bc959540d57dfaae67b5cd495ca4163fb0f (patch) | |
| tree | e72887ae9cc29108c0de482266dd896fbb52e6e2 | |
| parent | c33ae65c829038c29a76070f22ab8feebd688c95 (diff) | |
| download | phosphor-objmgr-799e7bc959540d57dfaae67b5cd495ca4163fb0f.tar.gz phosphor-objmgr-799e7bc959540d57dfaae67b5cd495ca4163fb0f.zip | |
server: Serve well-known bus names
Prior to this patch the mapper served unique connection
names. Serve well-known names instead so clients can
cache mapper lookup results.
Resolves openbmc/openbmc#1496
Resolves openbmc/openbmc#2670
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Signed-off-by: Nagaraju Goruganti <ngorugan@in.ibm.com>
Change-Id: I214f8cc56b2d70a7d000faf2a44cf8444ccd2ae9
| -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 182cf2c..32d8080 100644 --- a/obmc/mapper/server.py +++ b/obmc/mapper/server.py @@ -205,10 +205,9 @@ 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[self.unique] = obmc.mapper.MAPPER_NAME + self.bus_map[bus.get_unique_name()] = obmc.mapper.MAPPER_NAME self.namespaces = namespaces self.interface_namespaces = interface_namespaces self.blacklist = blacklist @@ -216,7 +215,8 @@ class ObjectMapper(dbus.service.Object): self.interface_blacklist = interface_blacklist # add my object mananger instance - self.add_new_objmgr(obmc.dbuslib.bindings.OBJ_PREFIX, self.unique) + self.add_new_objmgr( + obmc.dbuslib.bindings.OBJ_PREFIX, obmc.mapper.MAPPER_NAME) self.bus.add_signal_receiver( self.bus_handler, @@ -472,10 +472,10 @@ class ObjectMapper(dbus.service.Object): for owned_name, o in owners: if not self.valid_signal(owned_name): continue - self.bus_map[o] = owned_name - self.defer_signals[o] = [] + self.bus_map[owned_name] = o + self.defer_signals[owned_name] = [] find_dbus_interfaces( - self.bus, o, '/', + self.bus, owned_name, '/', self.discovery_callback, self.discovery_error, subtree_match=self.path_match, @@ -668,7 +668,7 @@ class ObjectMapper(dbus.service.Object): if create != delete: self.update_interfaces( - path, self.unique, delete, create) + path, obmc.mapper.MAPPER_NAME, delete, create) def update_associations( self, path, owner, old, new, created=[], destroyed=[]): |
