openstack/vitrage
Code Issues Proposed changes

listener_service - enable listen to multiple topics + specify exchange name

Browse Source 
Change-Id: I689c3bd3f39ed38c86710341b3778b11f9e48f68
This commit is contained in:
emalin 2017-07-25 12:47:05 +03:00
parent a54d1425b8
commit 0604e5ef1c
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vitrage/datasources/__init__.py
View File

@ -45,9 +45,13 @@ OPTS = [
min=1, min=1,
help='Time to wait until retrying to snapshot the datasource' help='Time to wait until retrying to snapshot the datasource'
' in case of fault'), ' in case of fault'),
cfg.StrOpt('notification_topic', cfg.ListOpt('notification_topics',
default='vitrage_notifications', default=['vitrage_notifications'],
help='Vitrage configured notifications topic'), help='Vitrage configured notifications topic',
deprecated_name='notification_topic'),
cfg.StrOpt('notification_exchange',
required=False,
help='Exchange that is used for notifications.'),
cfg.StrOpt('notification_topic_collector', cfg.StrOpt('notification_topic_collector',
default='vitrage_collector_notifications', default='vitrage_collector_notifications',
help='The topic on which event will be sent from the ' help='The topic on which event will be sent from the '

11
vitrage/datasources/listener_service.py
View File

@ -33,8 +33,10 @@ class ListenerService(os_service.Service):
self.enrich_callbacks_by_events = \ self.enrich_callbacks_by_events = \
self._create_callbacks_by_events_dict(drivers, conf) self._create_callbacks_by_events_dict(drivers, conf)
topic = conf.datasources.notification_topic topics = conf.datasources.notification_topics
self.listener = self._get_topic_listener(conf, topic, callback) exchange = conf.datasources.notification_exchange
self.listener = self._get_topics_listener(
conf, topics, callback, exchange)
def start(self): def start(self):
LOG.info("Vitrage data source Listener Service - Starting...") LOG.info("Vitrage data source Listener Service - Starting...")
@ -65,10 +67,11 @@ class ListenerService(os_service.Service):
return ret return ret
def _get_topic_listener(self, conf, topic, callback): def _get_topics_listener(self, conf, topics, callback, exchange=None):
# Create a listener for each topic # Create a listener for each topic
transport = messaging.get_transport(conf) transport = messaging.get_transport(conf)
targets = [oslo_messaging.Target(topic=topic)] targets = [oslo_messaging.Target(exchange=exchange, topic=topic)
for topic in topics]
return messaging.get_notification_listener( return messaging.get_notification_listener(
transport, transport,