diff options
| author | Oleksii Zamiatin <ozamiatin@mirantis.com> | 2015-10-12 20:09:21 +0300 |
|---|---|---|
| committer | Oleksii Zamiatin <ozamiatin@mirantis.com> | 2015-10-12 20:09:21 +0300 |
| commit | 974f7d3a91e2ed41f7f3fcc13ade4af3d720b888 (patch) | |
| tree | 4c3204971cb12601e13f1e611bbe0ad32e5c2dda | |
| parent | 80e20243a59e092dd2285aa278a496506a312108 (diff) | |
| download | oslo-messaging-974f7d3a91e2ed41f7f3fcc13ade4af3d720b888.tar.gz | |
Fix failures when zmq is not available.2.6.1
Observe a lot of crashes in services tests since 2.6.0 release.
Change-Id: I70e722e6553a9271b61dd54ffbba3f649d531b84
| -rw-r--r-- | oslo_messaging/_drivers/zmq_driver/zmq_names.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/oslo_messaging/_drivers/zmq_driver/zmq_names.py b/oslo_messaging/_drivers/zmq_driver/zmq_names.py index 0f3112e..a317456 100644 --- a/oslo_messaging/_drivers/zmq_driver/zmq_names.py +++ b/oslo_messaging/_drivers/zmq_driver/zmq_names.py @@ -17,15 +17,6 @@ from oslo_messaging._drivers.zmq_driver import zmq_async zmq = zmq_async.import_zmq() -ZMQ_SOCKET_STR = {zmq.DEALER: "DEALER", - zmq.ROUTER: "ROUTER", - zmq.PUSH: "PUSH", - zmq.PULL: "PULL", - zmq.REQ: "REQ", - zmq.REP: "REP", - zmq.PUB: "PUB", - zmq.SUB: "SUB"} - FIELD_FAILURE = 'failure' FIELD_REPLY = 'reply' FIELD_LOG_FAILURE = 'log_failure' @@ -51,4 +42,12 @@ NON_BLOCKING_TYPES = CAST_TYPES + NOTIFY_TYPES def socket_type_str(socket_type): - return ZMQ_SOCKET_STR[socket_type] + zmq_socket_str = {zmq.DEALER: "DEALER", + zmq.ROUTER: "ROUTER", + zmq.PUSH: "PUSH", + zmq.PULL: "PULL", + zmq.REQ: "REQ", + zmq.REP: "REP", + zmq.PUB: "PUB", + zmq.SUB: "SUB"} + return zmq_socket_str[socket_type] |