openstack/oslo.messaging
Code Issues Proposed changes

Merge "Use driver's notify_send() method again"

Browse Source
This commit is contained in:
Jenkins 2014-04-01 12:12:21 +00:00 committed by Gerrit Code Review
commit 6a2c39738c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
oslo/messaging/_drivers/amqpdriver.py
View File

@ -358,7 +358,8 @@ class AMQPDriverBase(base.BaseDriver):
return self._reply_q return self._reply_q
def _send(self, target, ctxt, message, def _send(self, target, ctxt, message,
wait_for_reply=None, timeout=None, envelope=True): wait_for_reply=None, timeout=None,
envelope=True, notify=False):
# FIXME(markmc): remove this temporary hack # FIXME(markmc): remove this temporary hack
class Context(object): class Context(object):
@ -388,7 +389,9 @@ class AMQPDriverBase(base.BaseDriver):
try: try:
with self._get_connection() as conn: with self._get_connection() as conn:
if target.fanout: if notify:
conn.notify_send(target.topic, msg)
elif target.fanout:
conn.fanout_send(target.topic, msg) conn.fanout_send(target.topic, msg)
else: else:
topic = target.topic topic = target.topic
@ -409,7 +412,8 @@ class AMQPDriverBase(base.BaseDriver):
return self._send(target, ctxt, message, wait_for_reply, timeout) return self._send(target, ctxt, message, wait_for_reply, timeout)
def send_notification(self, target, ctxt, message, version): def send_notification(self, target, ctxt, message, version):
return self._send(target, ctxt, message, envelope=(version == 2.0)) return self._send(target, ctxt, message,
envelope=(version == 2.0), notify=True)
def listen(self, target): def listen(self, target):
conn = self._get_connection(pooled=False) conn = self._get_connection(pooled=False)