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

Rearrange logging termination

Browse source
This commit is contained in:
Pedro Algarvio 2019-08-20 22:58:06 +01:00
parent 28fa5d22a7
commit 655efd691c
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tests/integration/__init__.py
View file

@ -1133,14 +1133,15 @@ class TestDaemon(object):
self.smaster_process.terminate()
except AttributeError:
pass
self.log_server.server_close()
self.log_server.shutdown()
self._exit_mockbin()
self._exit_ssh()
self.log_server_process.join()
# Shutdown the multiprocessing logging queue listener
salt_log_setup.shutdown_multiprocessing_logging()
salt_log_setup.shutdown_multiprocessing_logging_listener(daemonizing=True)
# Shutdown the log server
self.log_server.server_close()
self.log_server.shutdown()
self.log_server_process.join()
def pre_setup_minions(self):
'''