diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-15 07:46:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-15 07:46:57 +0000 |
| commit | 3f93dc8a7fa24b81811e34402b1d9f2c30781265 (patch) | |
| tree | 7dfc56909fecfaa1bb83cbee45fa19e5b32eed38 /openstack | |
| parent | d74668fbedc29aa4b7868fd3fb8a28d326f43d52 (diff) | |
| parent | 4ef495ec0821bf1508b9305423de70ba87216552 (diff) | |
| download | oslo-3f93dc8a7fa24b81811e34402b1d9f2c30781265.tar.gz oslo-3f93dc8a7fa24b81811e34402b1d9f2c30781265.tar.xz oslo-3f93dc8a7fa24b81811e34402b1d9f2c30781265.zip | |
Merge "call() to accept serialize and force_envelope"
Diffstat (limited to 'openstack')
| -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 d595212..b6195b0 100644 --- a/openstack/common/rpc/impl_zmq.py +++ b/openstack/common/rpc/impl_zmq.py @@ -579,7 +579,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 @@ -614,7 +615,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 @@ -670,7 +672,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): |