diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-22 16:46:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-22 16:46:44 +0000 |
| commit | eb2f2c757e01544ab6e67ffcc0a9dc741e69860f (patch) | |
| tree | 1b5ecd297376b299eda10a40a8afa4f184d11de0 /openstack/common/rpc/common.py | |
| parent | ad611a718b699eb377f271fa2e5bf2e26c602b75 (diff) | |
| parent | ec8465a7b1077a71082324220e7c44cf700a4d4b (diff) | |
| download | oslo-eb2f2c757e01544ab6e67ffcc0a9dc741e69860f.tar.gz oslo-eb2f2c757e01544ab6e67ffcc0a9dc741e69860f.tar.xz oslo-eb2f2c757e01544ab6e67ffcc0a9dc741e69860f.zip | |
Merge "Enable message envelope."
Diffstat (limited to 'openstack/common/rpc/common.py')
| -rw-r--r-- | openstack/common/rpc/common.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/openstack/common/rpc/common.py b/openstack/common/rpc/common.py index 5661bef..8bffc2b 100644 --- a/openstack/common/rpc/common.py +++ b/openstack/common/rpc/common.py @@ -70,10 +70,6 @@ _VERSION_KEY = 'oslo.version' _MESSAGE_KEY = 'oslo.message' -# TODO(russellb) Turn this on after Grizzly. -_SEND_RPC_ENVELOPE = False - - class RPCException(Exception): message = _("An unknown RPC related exception occurred.") @@ -441,10 +437,7 @@ def version_is_compatible(imp_version, version): return True -def serialize_msg(raw_msg, force_envelope=False): - if not _SEND_RPC_ENVELOPE and not force_envelope: - return raw_msg - +def serialize_msg(raw_msg): # NOTE(russellb) See the docstring for _RPC_ENVELOPE_VERSION for more # information about this format. msg = {_VERSION_KEY: _RPC_ENVELOPE_VERSION, |