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

BF: do not shutdown logging until all jails stop -- so move into Server.quit() 

Together with previous commit it should resolve failures with the server tests on python < 2.6
pull/124/head^2
Yaroslav Halchenko 2013-02-21 20:59:46 -05:00
parent 012264dce1
commit 154aa38e3f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/server.py
View File

@ -97,12 +97,6 @@ class Server:
except OSError, e: except OSError, e:
logSys.error("Unable to remove PID file: %s" % e) logSys.error("Unable to remove PID file: %s" % e)
logSys.info("Exiting Fail2ban") logSys.info("Exiting Fail2ban")
# Shutdowns the logging.
try:
self.__loggingLock.acquire()
logging.shutdown()
finally:
self.__loggingLock.release()
def quit(self): def quit(self):
# Stop communication first because if jail's unban action # Stop communication first because if jail's unban action
@ -112,8 +106,17 @@ class Server:
# are exiting) # are exiting)
# See https://github.com/fail2ban/fail2ban/issues/7 # See https://github.com/fail2ban/fail2ban/issues/7
self.__asyncServer.stop() self.__asyncServer.stop()
# Now stop all the jails # Now stop all the jails
self.stopAllJail() self.stopAllJail()
# Only now shutdown the logging.
try:
self.__loggingLock.acquire()
logging.shutdown()
finally:
self.__loggingLock.release()
def addJail(self, name, backend): def addJail(self, name, backend):
self.__jails.add(name, backend) self.__jails.add(name, backend)