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

Merge pull request #27461 from cachedout/clean_context_ioloop

Browse source 
Only clean context if it exists
This commit is contained in:
Mike Place 2015-09-29 09:49:52 -06:00
commit e8f58a6a3f
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/transport/zeromq.py
View file

@ -312,7 +312,8 @@ class AsyncZeroMQPubChannel(salt.transport.mixins.auth.AESPubClientMixin, salt.t
# TODO: Optionally call stream.close() on newer pyzmq? Its broken on some
self._stream.io_loop.remove_handler(self._stream.socket)
self._stream.socket.close(0)
self.context.term()
if hasattr(self, 'context'):
self.context.term()
def __del__(self):
self.destroy()