diff options
| author | Dan Prince <dprince@redhat.com> | 2012-08-30 15:08:25 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2012-08-31 10:03:51 -0400 |
| commit | ed11e1f7fe2b4b2691d49363ffd3034ec1d36fef (patch) | |
| tree | eca65fb1ee2cfa96546e3d175035c457e604b392 /nova/openstack | |
| parent | 68abbbbcf02650d24d65a1455ddd40099616c2bd (diff) | |
| download | nova-ed11e1f7fe2b4b2691d49363ffd3034ec1d36fef.tar.gz nova-ed11e1f7fe2b4b2691d49363ffd3034ec1d36fef.tar.xz nova-ed11e1f7fe2b4b2691d49363ffd3034ec1d36fef.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: I07a200d4b216c0c1e155b57588295b35a237576c
Diffstat (limited to 'nova/openstack')
| -rw-r--r-- | nova/openstack/common/rpc/impl_zmq.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/openstack/common/rpc/impl_zmq.py b/nova/openstack/common/rpc/impl_zmq.py index 8d6c73206..4ffb1ae69 100644 --- a/nova/openstack/common/rpc/impl_zmq.py +++ b/nova/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 |