github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity

fix sporadic error, wait for shutdown/exit messages by assert-check, better prevention of dual (parallel) stop

pull/2048/head
sebres 2018-02-01 18:30:00 +01:00
parent 2c03f5ad28
commit f1661d35ea
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fail2ban/tests/fail2banclienttestcase.py
View File

@ -312,7 +312,9 @@ def with_foreground_server_thread(startextra={}):
# wait for end sign: # wait for end sign:
Utils.wait_for(lambda: phase.get('end', None) is not None, MAX_WAITTIME) Utils.wait_for(lambda: phase.get('end', None) is not None, MAX_WAITTIME)
self.assertTrue(phase.get('end', None)) self.assertTrue(phase.get('end', None))
self.assertLogged("Shutdown successful", "Exiting Fail2ban", all=True) self.assertLogged("Shutdown successful", "Exiting Fail2ban", all=True, wait=MAX_WAITTIME)
# set to NOP: avoid dual call
self.stopAndWaitForServerEnd = lambda *args, **kwargs: None
self.stopAndWaitForServerEnd = _stopAndWaitForServerEnd self.stopAndWaitForServerEnd = _stopAndWaitForServerEnd
# wait for start thread: # wait for start thread:
Utils.wait_for(lambda: phase.get('start', None) is not None, MAX_WAITTIME) Utils.wait_for(lambda: phase.get('start', None) is not None, MAX_WAITTIME)
@ -333,7 +335,6 @@ def with_foreground_server_thread(startextra={}):
# so don't kill (same process) - if success, just wait for end of worker: # so don't kill (same process) - if success, just wait for end of worker:
if phase.get('end', None): if phase.get('end', None):
th.join() th.join()
self.stopAndWaitForServerEnd = None
return wrapper return wrapper
return _deco_wrapper return _deco_wrapper