summaryrefslogtreecommitdiffstats
path: root/openstack/common
diff options
context:
space:
mode:
authorEric Windisch <eric@cloudscaling.com>2013-02-28 13:28:34 -0500
committerEric Windisch <eric@cloudscaling.com>2013-02-28 13:28:34 -0500
commit82f3691de3dbf9c18f8fa151db9d21837410a128 (patch)
tree293dd02af8018ef8b6ed89a835f60630a936cea9 /openstack/common
parentc4400ec172fe7a57cbf92dcdce365ddb1ab66bae (diff)
downloadoslo-82f3691de3dbf9c18f8fa151db9d21837410a128.tar.gz
oslo-82f3691de3dbf9c18f8fa151db9d21837410a128.tar.xz
oslo-82f3691de3dbf9c18f8fa151db9d21837410a128.zip
Zmq correct envelope param for notify()
The notify parameter was expected as a kwarg, although __init__.py expects this to be a standard argument. Tests are not yet covering this, but are forthcoming. Change-Id: Id6a0a81ef250e43c7ab3dc9d5392f89752d0f313
Diffstat (limited to 'openstack/common')
-rw-r--r--openstack/common/rpc/impl_zmq.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/openstack/common/rpc/impl_zmq.py b/openstack/common/rpc/impl_zmq.py
index 82e7e17..e7aa4fb 100644
--- a/openstack/common/rpc/impl_zmq.py
+++ b/openstack/common/rpc/impl_zmq.py
@@ -785,7 +785,7 @@ def fanout_cast(conf, context, topic, msg, **kwargs):
_multi_send(_cast, context, 'fanout~' + str(topic), msg, **kwargs)
-def notify(conf, context, topic, msg, **kwargs):
+def notify(conf, context, topic, msg, envelope):
"""
Send notification event.
Notifications are sent to topic-priority.
@@ -794,8 +794,7 @@ def notify(conf, context, topic, msg, **kwargs):
# NOTE(ewindisch): dot-priority in rpc notifier does not
# work with our assumptions.
topic = topic.replace('.', '-')
- kwargs['envelope'] = kwargs.get('envelope', True)
- cast(conf, context, topic, msg, **kwargs)
+ cast(conf, context, topic, msg, envelope=envelope)
def cleanup():