diff options
| author | Eric Windisch <eric@cloudscaling.com> | 2013-01-10 11:41:26 -0500 |
|---|---|---|
| committer | Eric Windisch <eric@cloudscaling.com> | 2013-01-10 12:13:34 -0500 |
| commit | 4ef495ec0821bf1508b9305423de70ba87216552 (patch) | |
| tree | 05d1d98844869d14e19d67cde1cd5024ce77a975 /openstack/common | |
| parent | a8973c524c9fe901972ba61f34dafac7438417c9 (diff) | |
| download | oslo-4ef495ec0821bf1508b9305423de70ba87216552.tar.gz oslo-4ef495ec0821bf1508b9305423de70ba87216552.tar.xz oslo-4ef495ec0821bf1508b9305423de70ba87216552.zip | |
call() to accept serialize and force_envelope
The serialize and force_envelope options were
being stripped from call().
Now, when call() is invoked, these options
are passed and respected.
Change-Id: I69355606b06ab2ec87765fe6ddba7baaa68e5754
Diffstat (limited to 'openstack/common')
| -rw-r--r-- | openstack/common/rpc/impl_zmq.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/openstack/common/rpc/impl_zmq.py b/openstack/common/rpc/impl_zmq.py index c147b27..725f34b 100644 --- a/openstack/common/rpc/impl_zmq.py +++ b/openstack/common/rpc/impl_zmq.py @@ -551,7 +551,8 @@ def _cast(addr, context, msg_id, topic, msg, timeout=None, serialize=True, conn.close() -def _call(addr, context, msg_id, topic, msg, timeout=None): +def _call(addr, context, msg_id, topic, msg, timeout=None, + serialize=True, force_envelope=False): # timeout_response is how long we wait for a response timeout = timeout or CONF.rpc_response_timeout @@ -586,7 +587,8 @@ def _call(addr, context, msg_id, topic, msg, timeout=None): ) LOG.debug(_("Sending cast")) - _cast(addr, context, msg_id, topic, payload) + _cast(addr, context, msg_id, topic, payload, + serialize=serialize, force_envelope=force_envelope) LOG.debug(_("Cast sent; Waiting reply")) # Blocks until receives reply @@ -642,7 +644,8 @@ def _multi_send(method, context, topic, msg, timeout=None, serialize=True, _topic, _topic, msg, timeout, serialize, force_envelope) return - return method(_addr, context, _topic, _topic, msg, timeout) + return method(_addr, context, _topic, _topic, msg, timeout, + serialize, force_envelope) def create_connection(conf, new=True): |