diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-11-29 20:58:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-11-29 20:58:14 +0000 |
| commit | 86b0750f3e349d7567fbdf94adb3999570af0d28 (patch) | |
| tree | cca75b8a658ccfe97811b2e3fdf1d6012a708629 | |
| parent | f9ab2e105fc079d102ce18be1b767eeb44146a4c (diff) | |
| parent | 41c629dc030e7af10b34cd68b62ed42f771751c2 (diff) | |
| download | oslo-messaging-86b0750f3e349d7567fbdf94adb3999570af0d28.tar.gz | |
Merge "Avoid storing configuration in notifier"
| -rw-r--r-- | oslo/messaging/notify/notifier.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/oslo/messaging/notify/notifier.py b/oslo/messaging/notify/notifier.py index 115df28..5e559c3 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 |