From ed11e1f7fe2b4b2691d49363ffd3034ec1d36fef Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Thu, 30 Aug 2012 15:08:25 -0400 Subject: 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 --- nova/openstack/common/rpc/impl_zmq.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nova/openstack') 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 -- cgit