x/stacktach
Code Issues Proposed changes

Adding queue_name to worker config.

Browse Source 
The idea behind this is to allow consumption of notifications
    from a service that can only emit notifications on a
    single routing_key.
This commit is contained in:
Andrew Melton 2013-07-30 11:51:55 -04:00
parent 65b4968bbb
commit a709d957fd
3 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/sample_stacktach_worker_config.json
View File

@ -8,6 +8,7 @@
"rabbit_password": "rabbit", "rabbit_password": "rabbit",
"rabbit_virtual_host": "/", "rabbit_virtual_host": "/",
"exit_on_exception": true, "exit_on_exception": true,
"queue_name": "stacktach",
"topics": { "topics": {
"nova": ["monitor.info", "monitor.error"], "nova": ["monitor.info", "monitor.error"],
"glance": ["monitor_glance.info", "monitor_glance.error"] "glance": ["monitor_glance.info", "monitor_glance.error"]
@ -22,6 +23,7 @@
"rabbit_password": "rabbit", "rabbit_password": "rabbit",
"rabbit_virtual_host": "/", "rabbit_virtual_host": "/",
"exit_on_exception": false, "exit_on_exception": false,
"queue_name": "stacktach",
"topics": { "topics": {
"nova": ["monitor.info", "monitor.error"], "nova": ["monitor.info", "monitor.error"],
"glance": ["monitor_glance.info", "monitor_glance.error"] "glance": ["monitor_glance.info", "monitor_glance.error"]

26
tests/unit/test_worker.py
View File

@ -49,14 +49,15 @@ class ConsumerTestCase(unittest.TestCase):
self.mox.StubOutWithMock(worker.Consumer, '_create_exchange') self.mox.StubOutWithMock(worker.Consumer, '_create_exchange')
self.mox.StubOutWithMock(worker.Consumer, '_create_queue') self.mox.StubOutWithMock(worker.Consumer, '_create_queue')
consumer = worker.Consumer('test', None, None, True, {}, "nova", consumer = worker.Consumer('test', None, None, True, {}, "nova",
["monitor.info", "monitor.error"]) ["monitor.info", "monitor.error"],
"stacktach")
exchange = self.mox.CreateMockAnything() exchange = self.mox.CreateMockAnything()
consumer._create_exchange('nova', 'topic').AndReturn(exchange) consumer._create_exchange('nova', 'topic').AndReturn(exchange)
info_queue = self.mox.CreateMockAnything() info_queue = self.mox.CreateMockAnything()
error_queue = self.mox.CreateMockAnything() error_queue = self.mox.CreateMockAnything()
consumer._create_queue('monitor.info', exchange, 'monitor.info')\ consumer._create_queue('stacktach', exchange, 'monitor.info')\
.AndReturn(info_queue) .AndReturn(info_queue)
consumer._create_queue('monitor.error', exchange, 'monitor.error')\ consumer._create_queue('stacktach', exchange, 'monitor.error')\
.AndReturn(error_queue) .AndReturn(error_queue)
self.mox.ReplayAll() self.mox.ReplayAll()
consumers = consumer.get_consumers(Consumer, None) consumers = consumer.get_consumers(Consumer, None)
@ -72,7 +73,8 @@ class ConsumerTestCase(unittest.TestCase):
def test_create_exchange(self): def test_create_exchange(self):
args = {'key': 'value'} args = {'key': 'value'}
consumer = worker.Consumer('test', None, None, True, args, 'nova', consumer = worker.Consumer('test', None, None, True, args, 'nova',
["monitor.info", "monitor.error"]) ["monitor.info", "monitor.error"],
"stacktach")
self.mox.StubOutClassWithMocks(kombu.entity, 'Exchange') self.mox.StubOutClassWithMocks(kombu.entity, 'Exchange')
exchange = kombu.entity.Exchange('nova', type='topic', exclusive=False, exchange = kombu.entity.Exchange('nova', type='topic', exclusive=False,
@ -89,7 +91,8 @@ class ConsumerTestCase(unittest.TestCase):
exclusive=False, routing_key='routing.key', exclusive=False, routing_key='routing.key',
queue_arguments={}) queue_arguments={})
consumer = worker.Consumer('test', None, None, True, {}, 'nova', consumer = worker.Consumer('test', None, None, True, {}, 'nova',
["monitor.info", "monitor.error"]) ["monitor.info", "monitor.error"],
"stacktach")
self.mox.ReplayAll() self.mox.ReplayAll()
actual_queue = consumer._create_queue('name', exchange, 'routing.key', actual_queue = consumer._create_queue('name', exchange, 'routing.key',
exclusive=False, exclusive=False,
@ -106,7 +109,8 @@ class ConsumerTestCase(unittest.TestCase):
exclusive=False, routing_key='routing.key', exclusive=False, routing_key='routing.key',
queue_arguments=queue_args) queue_arguments=queue_args)
consumer = worker.Consumer('test', None, None, True, queue_args, consumer = worker.Consumer('test', None, None, True, queue_args,
'nova', ["monitor.info", "monitor.error"]) 'nova', ["monitor.info", "monitor.error"],
"stacktach")
self.mox.ReplayAll() self.mox.ReplayAll()
actual_queue = consumer._create_queue('name', exchange, 'routing.key', actual_queue = consumer._create_queue('name', exchange, 'routing.key',
exclusive=False, exclusive=False,
@ -122,7 +126,8 @@ class ConsumerTestCase(unittest.TestCase):
exchange = 'nova' exchange = 'nova'
consumer = worker.Consumer('test', None, deployment, True, {}, consumer = worker.Consumer('test', None, deployment, True, {},
exchange, ["monitor.info", "monitor.error"]) exchange, ["monitor.info", "monitor.error"],
"stacktach")
routing_key = 'monitor.info' routing_key = 'monitor.info'
message.delivery_info = {'routing_key': routing_key} message.delivery_info = {'routing_key': routing_key}
body_dict = {u'key': u'value'} body_dict = {u'key': u'value'}
@ -183,7 +188,8 @@ class ConsumerTestCase(unittest.TestCase):
exchange = 'nova' exchange = 'nova'
consumer = worker.Consumer(config['name'], conn, deployment, consumer = worker.Consumer(config['name'], conn, deployment,
config['durable_queue'], {}, exchange, config['durable_queue'], {}, exchange,
["monitor.info", "monitor.error"]) ["monitor.info", "monitor.error"],
"stacktach")
consumer.run() consumer.run()
worker.continue_running().AndReturn(False) worker.continue_running().AndReturn(False)
self.mox.ReplayAll() self.mox.ReplayAll()
@ -200,6 +206,7 @@ class ConsumerTestCase(unittest.TestCase):
'rabbit_password': 'rabbit', 'rabbit_password': 'rabbit',
'rabbit_virtual_host': '/', 'rabbit_virtual_host': '/',
'queue_arguments': {'x-ha-policy': 'all'}, 'queue_arguments': {'x-ha-policy': 'all'},
'queue_name': "test_name",
"services": ["nova"], "services": ["nova"],
"topics": {"nova": ["monitor.info", "monitor.error"]} "topics": {"nova": ["monitor.info", "monitor.error"]}
} }
@ -225,7 +232,8 @@ class ConsumerTestCase(unittest.TestCase):
consumer = worker.Consumer(config['name'], conn, deployment, consumer = worker.Consumer(config['name'], conn, deployment,
config['durable_queue'], config['durable_queue'],
config['queue_arguments'], exchange, config['queue_arguments'], exchange,
["monitor.info", "monitor.error"]) ["monitor.info", "monitor.error"],
"test_name")
consumer.run() consumer.run()
worker.continue_running().AndReturn(False) worker.continue_running().AndReturn(False)
self.mox.ReplayAll() self.mox.ReplayAll()

9
worker/worker.py
View File

@ -44,7 +44,7 @@ LOG = stacklog.get_logger()
class Consumer(kombu.mixins.ConsumerMixin): class Consumer(kombu.mixins.ConsumerMixin):
def __init__(self, name, connection, deployment, durable, queue_arguments, def __init__(self, name, connection, deployment, durable, queue_arguments,
exchange, topics): exchange, topics, queue_name):
self.connection = connection self.connection = connection
self.deployment = deployment self.deployment = deployment
self.durable = durable self.durable = durable
@ -56,6 +56,7 @@ class Consumer(kombu.mixins.ConsumerMixin):
self.total_processed = 0 self.total_processed = 0
self.topics = topics self.topics = topics
self.exchange = exchange self.exchange = exchange
self.queue_name = queue_name
def _create_exchange(self, name, type, exclusive=False, auto_delete=False): def _create_exchange(self, name, type, exclusive=False, auto_delete=False):
return kombu.entity.Exchange(name, type=type, exclusive=exclusive, return kombu.entity.Exchange(name, type=type, exclusive=exclusive,
@ -72,7 +73,7 @@ class Consumer(kombu.mixins.ConsumerMixin):
def get_consumers(self, Consumer, channel): def get_consumers(self, Consumer, channel):
exchange = self._create_exchange(self.exchange, "topic") exchange = self._create_exchange(self.exchange, "topic")
queues = [self._create_queue(topic, exchange, topic) queues = [self._create_queue(self.queue_name, exchange, topic)
for topic in self.topics] for topic in self.topics]
return [Consumer(queues=queues, callbacks=[self.on_nova])] return [Consumer(queues=queues, callbacks=[self.on_nova])]
@ -152,6 +153,7 @@ def run(deployment_config, exchange):
queue_arguments = deployment_config.get('queue_arguments', {}) queue_arguments = deployment_config.get('queue_arguments', {})
exit_on_exception = deployment_config.get('exit_on_exception', False) exit_on_exception = deployment_config.get('exit_on_exception', False)
topics = deployment_config.get('topics', {}) topics = deployment_config.get('topics', {})
queue_name = deployment_config.get('queue_name', 'stacktach')
deployment, new = db.get_or_create_deployment(name) deployment, new = db.get_or_create_deployment(name)
@ -174,7 +176,8 @@ def run(deployment_config, exchange):
try: try:
consumer = Consumer(name, conn, deployment, durable, consumer = Consumer(name, conn, deployment, durable,
queue_arguments, exchange, queue_arguments, exchange,
topics[exchange]) topics[exchange],
queue_name)
consumer.run() consumer.run()
except Exception as e: except Exception as e:
LOG.error("!!!!Exception!!!!") LOG.error("!!!!Exception!!!!")