From 41c629dc030e7af10b34cd68b62ed42f771751c2 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Fri, 29 Nov 2013 17:50:59 +0100 Subject: [PATCH] Avoid storing configuration in notifier The notifier itself doesn't use the configuration. So let's not store it, that lights the dependency a bit on this configuration object. Blueprint: messaging-decouple-cfg Change-Id: Ic4b5ddd93ea0382bd8292f9e31b7dacba9b489d3 --- oslo/messaging/notify/notifier.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/oslo/messaging/notify/notifier.py b/oslo/messaging/notify/notifier.py index 115df2858..5e559c306 100644 --- a/oslo/messaging/notify/notifier.py +++ b/oslo/messaging/notify/notifier.py @@ -110,24 +110,23 @@ class Notifier(object): :param serializer: an optional entity serializer :type serializer: Serializer """ - self.conf = transport.conf - self.conf.register_opts(_notifier_opts) + transport.conf.register_opts(_notifier_opts) self.transport = transport self.publisher_id = publisher_id self._driver_names = ([driver] if driver is not None - else self.conf.notification_driver) + else transport.conf.notification_driver) self._topics = ([topic] if topic is not None - else self.conf.notification_topics) + else transport.conf.notification_topics) self._serializer = serializer or msg_serializer.NoOpSerializer() self._driver_mgr = named.NamedExtensionManager( 'oslo.messaging.notify.drivers', names=self._driver_names, invoke_on_load=True, - invoke_args=[self.conf], + invoke_args=[transport.conf], invoke_kwds={ 'topics': self._topics, 'transport': self.transport, @@ -251,7 +250,6 @@ class _SubNotifier(Notifier): def __init__(self, base, publisher_id): self._base = base - self.conf = base.conf self.transport = base.transport self.publisher_id = publisher_id