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

Log exceptions at exception level

Browse source
This commit is contained in:
Daniel A. Wozniak 2018-04-27 00:15:03 -07:00
parent d4ae787595
commit 6db2a0e4d3
No known key found for this signature in database
GPG key ID: 166B9D2C06C82D61
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/transport/tcp.py
View file

@ -558,7 +558,10 @@ class TCPReqServerChannel(salt.transport.mixins.auth.AESReqServerMixin, salt.tra
self._socket.close()
self._socket = None
if hasattr(self.req_server, 'stop'):
self.req_server.stop()
try:
self.req_server.stop()
except Exception as exc:
log.exception('TCPReqServerChannel close generated an exception: %s', str(exc))
def __del__(self):
self.close()
@ -750,9 +753,8 @@ if USE_LOAD_BALANCER:
self.thread.start()
def stop(self):
if self.thread.is_alive():
self._stop.set()
self.thread.join()
self._stop.set()
self.thread.join()
def socket_queue_thread(self):
try: