From c7b099f7851b1b64badd23e2f4c34d13978dca03 Mon Sep 17 00:00:00 2001 From: Cyril Jaquier Date: Sun, 25 Nov 2007 20:51:32 +0000 Subject: [PATCH] - Removed date from logging message when using SYSLOG. Thanks to Iain Lea git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@626 a942ae1a-1317-0410-a47c-b1dcaea8d605 --- CHANGELOG | 2 ++ server/server.py | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index fa48e0b7..2e75b008 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -18,6 +18,8 @@ ver. 0.8.2 (2007/??/??) - stable Halchenko. It will be possible to create stronger failregex against log injection - Fixed ipfw action script. Thanks to Nick Munger +- Removed date from logging message when using SYSLOG. Thanks + to Iain Lea ver. 0.8.1 (2007/08/14) - stable ---------- diff --git a/server/server.py b/server/server.py index 832cfaa7..108fac81 100644 --- a/server/server.py +++ b/server/server.py @@ -315,7 +315,11 @@ class Server: def setLogTarget(self, target): try: self.__loggingLock.acquire() + # set a format which is simpler for console use + formatter = logging.Formatter("%(asctime)s %(name)-16s: %(levelname)-6s %(message)s") if target == "SYSLOG": + # Syslog daemons already add date to the message. + formatter = logging.Formatter("%(name)-16s: %(levelname)-6s %(message)s") facility = logging.handlers.SysLogHandler.LOG_DAEMON hdlr = logging.handlers.SysLogHandler("/dev/log", facility = facility) @@ -336,10 +340,8 @@ class Server: # Removes previous handlers for handler in logging.getLogger("fail2ban").handlers: # Closes the handler. - handler.close() logging.getLogger("fail2ban").removeHandler(handler) - # set a format which is simpler for console use - formatter = logging.Formatter("%(asctime)s %(name)-16s: %(levelname)-6s %(message)s") + handler.close() # tell the handler to use this format hdlr.setFormatter(formatter) logging.getLogger("fail2ban").addHandler(hdlr)