From 82f3691de3dbf9c18f8fa151db9d21837410a128 Mon Sep 17 00:00:00 2001 From: Eric Windisch Date: Thu, 28 Feb 2013 13:28:34 -0500 Subject: 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 --- openstack/common/rpc/impl_zmq.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'openstack') 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(): -- cgit