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 #47317 from dwoz/threadshutdown

Browse source 
Do not join a thread that is stopped
This commit is contained in:
Nicole Thomas 2018-04-27 09:15:08 -04:00 • committed by GitHub
commit 629503b2a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/transport/tcp.py
View file

@ -561,7 +561,7 @@ class TCPReqServerChannel(salt.transport.mixins.auth.AESReqServerMixin, salt.tra
try:
self.req_server.stop()
except Exception as exc:
log.debug("TCPReqServerChannel close generated an exception: %s", str(exc))
log.exception('TCPReqServerChannel close generated an exception: %s', str(exc))
def __del__(self):
self.close()