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

Stop socket before queue on delete

Browse source
This commit is contained in:
Daniel A Wozniak 2018-04-25 02:20:08 +00:00 • committed by Daniel A. Wozniak
parent 9587f5c69e
commit dbe671f943
No known key found for this signature in database
GPG key ID: 166B9D2C06C82D61
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/transport/tcp.py
View file

@ -545,8 +545,6 @@ class TCPReqServerChannel(salt.transport.mixins.auth.AESReqServerMixin, salt.tra
return self._socket
def close(self):
if hasattr(self.req_server, 'stop'):
self.req_server.stop()
if self._socket is not None:
try:
self._socket.shutdown(socket.SHUT_RDWR)
@ -559,6 +557,8 @@ class TCPReqServerChannel(salt.transport.mixins.auth.AESReqServerMixin, salt.tra
raise exc
self._socket.close()
self._socket = None
if hasattr(self.req_server, 'stop'):
self.req_server.stop()
def __del__(self):
self.close()