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

- Fix retryAllowed. It is now conf["maxretry"] 

- Add SIGTERM handler in order to exit properly when in daemon mode


git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@37 a942ae1a-1317-0410-a47c-b1dcaea8d605
0.6
Cyril Jaquier 2004-10-18 20:50:56 +00:00
parent b9349fd45e
commit c7513aba77
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fail2ban.py
View File

@ -146,6 +146,15 @@ def createDaemon():
return(0) return(0)
def sigTERMhandler(signum, frame):
""" Handles the TERM signal when in daemon mode in order to
exit properly.
"""
logSys.debug("Signal handler called with sig "+`signum`)
logSys.info("Restoring iptables...")
fireWall.flushBanList(conf["debug"])
logSys.info("Exiting...")
sys.exit(0)
if __name__ == "__main__": if __name__ == "__main__":
@ -289,6 +298,7 @@ if __name__ == "__main__":
logSys.set_formatstring(log4py.FMT_DEBUG) logSys.set_formatstring(log4py.FMT_DEBUG)
elif c == "background" and conf[c]: elif c == "background" and conf[c]:
retCode = createDaemon() retCode = createDaemon()
signal.signal(signal.SIGTERM, sigTERMhandler)
logSys.set_target(conf["logfile"]) logSys.set_target(conf["logfile"])
if retCode != 0: if retCode != 0:
logSys.error("Unable to start daemon") logSys.error("Unable to start daemon")
@ -351,7 +361,7 @@ if __name__ == "__main__":
iterFailList = failList.iteritems() iterFailList = failList.iteritems()
for i in range(len(failList)): for i in range(len(failList)):
element = iterFailList.next() element = iterFailList.next()
if element[1][0] >= retryAllowed: if element[1][0] >= conf["maxretry"]:
fireWall.addBanIP(element[0], conf["debug"]) fireWall.addBanIP(element[0], conf["debug"])
except KeyboardInterrupt: except KeyboardInterrupt: