saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Restrict pyzmq optimizations to pyzmq >= 14.3.0

Browse source 
The optimizations added in 00f31bf cause problems with older ZMQ
versions.
This commit is contained in:
Erik Johnson 2018-01-20 16:44:46 -06:00 • committed by rallytime
parent 58ad558346
commit a38f4cb6d6
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
salt/transport/zeromq.py
View file

@ -40,6 +40,9 @@ try:
except ImportError:
HAS_ZMQ_MONITOR = False
LIBZMQ_VERSION = tuple(map(int, zmq.zmq_version().split('.')))
PYZMQ_VERSION = tuple(map(int, zmq.pyzmq_version().split('.')))
# Import Tornado Libs
import tornado
import tornado.gen
@ -359,7 +362,12 @@ class AsyncZeroMQPubChannel(salt.transport.mixins.auth.AESPubClientMixin, salt.t
self._monitor.stop()
self._monitor = None
if hasattr(self, '_stream'):
self._stream.close(0)
if PYZMQ_VERSION < (14, 3, 0):
# stream.close() doesn't work properly on pyzmq < 14.3.0
self._stream.io_loop.remove_handler(self._stream.socket)
self._stream.socket.close(0)
else:
self._stream.close(0)
elif hasattr(self, '_socket'):
self._socket.close(0)
if hasattr(self, 'context') and self.context.closed is False:
@ -911,8 +919,17 @@ class AsyncReqMessageClient(object):
# TODO: timeout all in-flight sessions, or error
def destroy(self):
if hasattr(self, 'stream') and self.stream is not None:
self.stream.close()
self.socket = None
if PYZMQ_VERSION < (14, 3, 0):
# stream.close() doesn't work properly on pyzmq < 14.3.0
if self.stream.socket:
self.stream.socket.close()
self.stream.io_loop.remove_handler(self.stream.socket)
# set this to None, more hacks for messed up pyzmq
self.stream.socket = None
self.socket.close()
else:
self.stream.close()
self.socket = None
self.stream = None
if self.context.closed is False:
self.context.term()