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

corrected for proper format of SYSLOG entries

debian-releases/etch
Yaroslav Halchenko 2005-08-19 10:34:03 +00:00
parent 21ed0e04e0
commit ea7f23e534
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/TODO vendored
View File

@ -1,3 +1,4 @@
* Collect more sections for other log files * Collect more sections for other log files
* Compose a filter for logwatch
-- debian@onerussian.com -- debian@onerussian.com

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
fail2ban (0.5.2-4) unstable; urgency=low
* Format of SYSLOG entries is up to the standard now
-- Yaroslav Halchenko <debian@onerussian.com> Fri, 19 Aug 2005 00:06:44 -1000
fail2ban (0.5.2-3) unstable; urgency=low fail2ban (0.5.2-3) unstable; urgency=low
* Fixed errata in /etc/default/fail2ban (closes: #323451) * Fixed errata in /etc/default/fail2ban (closes: #323451)

17
fail2ban.py
View File

@ -145,7 +145,8 @@ def main():
logSys.addHandler(stdout) logSys.addHandler(stdout)
# Default formatter # Default formatter
formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s') formatterstring='%(levelname)s: %(message)s'
formatter = logging.Formatter('%(asctime)s ' + formatterstring)
stdout.setFormatter(formatter) stdout.setFormatter(formatter)
conf["verbose"] = 0 conf["verbose"] = 0
@ -230,9 +231,9 @@ def main():
# Set debug log level # Set debug log level
if conf["debug"]: if conf["debug"]:
logSys.setLevel(logging.DEBUG) logSys.setLevel(logging.DEBUG)
formatter = logging.Formatter("%(asctime)s %(levelname)s " + formatterstring = ('%(levelname)s: [%(filename)s (%(lineno)d)] ' +
"[%(filename)s (%(lineno)d)] " + '%(message)s')
"%(message)s") formatter = logging.Formatter("%(asctime)s " + formatterstring)
stdout.setFormatter(formatter) stdout.setFormatter(formatter)
logSys.warn("DEBUG MODE: FIREWALL COMMANDS ARE _NOT_ EXECUTED BUT " + logSys.warn("DEBUG MODE: FIREWALL COMMANDS ARE _NOT_ EXECUTED BUT " +
"ONLY DISPLAYED IN THE LOG MESSAGES") "ONLY DISPLAYED IN THE LOG MESSAGES")
@ -242,6 +243,9 @@ def main():
# Bug fix for #1234699 # Bug fix for #1234699
os.umask(0077) os.umask(0077)
for target in conf["logtargets"].split(): for target in conf["logtargets"].split():
# target formatter
# By default global formatter is taken. Is different for SYSLOG
tformatter = formatter
if target == "STDERR": if target == "STDERR":
hdlr = logging.StreamHandler(sys.stderr) hdlr = logging.StreamHandler(sys.stderr)
elif target == "SYSLOG": elif target == "SYSLOG":
@ -273,7 +277,8 @@ def main():
port = int(syslogtargets[3]) port = int(syslogtargets[3])
syslogtarget = (syslogtargets[1], port) syslogtarget = (syslogtargets[1], port)
hdlr = logging.handlers.SysLogHandler(syslogtarget, facility) hdlr = logging.handlers.SysLogHandler(syslogtarget, facility)
tformatter = logging.Formatter("fail2ban[%(process)d]: " +
formatterstring);
else: else:
# Target should be a file # Target should be a file
try: try:
@ -283,7 +288,7 @@ def main():
logSys.error("Unable to log to " + target) logSys.error("Unable to log to " + target)
continue continue
# Set formatter and add handler to logger # Set formatter and add handler to logger
hdlr.setFormatter(formatter) hdlr.setFormatter(tformatter)
logSys.addHandler(hdlr) logSys.addHandler(hdlr)
# Ignores IP list # Ignores IP list