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