diff options
| author | Dan Prince <dprince@redhat.com> | 2012-08-30 16:58:08 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2012-08-30 17:52:04 -0400 |
| commit | 55ca1852bb489b4e3cd6af90389c7d9db88db3f6 (patch) | |
| tree | afb3c0ac17344019dedf551a8c0204dd4eda5da4 /openstack | |
| parent | 33c9880421bdb877005a9c8579d92bf7a96b66ea (diff) | |
| download | oslo-55ca1852bb489b4e3cd6af90389c7d9db88db3f6.tar.gz oslo-55ca1852bb489b4e3cd6af90389c7d9db88db3f6.tar.xz oslo-55ca1852bb489b4e3cd6af90389c7d9db88db3f6.zip | |
Update zmq context cleanup to use term.
Updates the RPC cleanup function for the zmq RPC driver
to use Context.term() instead of Context.destroy().
This allows the Nova code to work with older versions (pre 2.1.10)
of pyzmq. The Context term() function seems to do the job just as well as
destroy() (and is also thread safe) so lets just use it instead.
Fixes LP Bug #1044004.
Change-Id: Ifadd2c19914abfe5dbb58310d21eb6c78563fb82
Diffstat (limited to 'openstack')
| -rw-r--r-- | openstack/common/rpc/impl_zmq.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openstack/common/rpc/impl_zmq.py b/openstack/common/rpc/impl_zmq.py index efc94c0..aab664c 100644 --- a/openstack/common/rpc/impl_zmq.py +++ b/openstack/common/rpc/impl_zmq.py @@ -677,7 +677,7 @@ def cleanup(): global ZMQ_CTX global matchmaker matchmaker = None - ZMQ_CTX.destroy() + ZMQ_CTX.term() ZMQ_CTX = None |