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

simplify/unify log message

pull/930/head
Lee Clemens 2015-01-28 19:43:22 -05:00
parent 076b103f97
commit f4341999cd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fail2ban/server/filter.py
View File

@ -340,7 +340,7 @@ class Filter(JailThread):
def logIgnoreIp(self, ip, log_ignore, ignore_source="unknown source"): def logIgnoreIp(self, ip, log_ignore, ignore_source="unknown source"):
if log_ignore: if log_ignore:
logSys.info("[%s] Ignore %s due to %s" % (self.jail.name, ip, ignore_source)) logSys.info("[%s] Ignore %s by %s" % (self.jail.name, ip, ignore_source))
def getIgnoreIP(self): def getIgnoreIP(self):
return self.__ignoreIpList return self.__ignoreIpList
@ -373,19 +373,19 @@ class Filter(JailThread):
# Check if IP in DNS # Check if IP in DNS
ips = DNSUtils.dnsToIp(i) ips = DNSUtils.dnsToIp(i)
if ip in ips: if ip in ips:
self.logIgnoreIp(ip, log_ignore, ignore_source="ignoreip by dns") self.logIgnoreIp(ip, log_ignore, ignore_source="dns")
return True return True
else: else:
continue continue
if a == b: if a == b:
self.logIgnoreIp(ip, log_ignore, ignore_source="ignoreip by addr") self.logIgnoreIp(ip, log_ignore, ignore_source="ip")
return True return True
if self.__ignoreCommand: if self.__ignoreCommand:
command = CommandAction.replaceTag(self.__ignoreCommand, { 'ip': ip } ) command = CommandAction.replaceTag(self.__ignoreCommand, { 'ip': ip } )
logSys.debug('ignore command: ' + command) logSys.debug('ignore command: ' + command)
ret_ignore = CommandAction.executeCmd(command) ret_ignore = CommandAction.executeCmd(command)
self.logIgnoreIp(ip, log_ignore and ret_ignore, ignore_source="ignorecommand") self.logIgnoreIp(ip, log_ignore and ret_ignore, ignore_source="command")
return ret_ignore return ret_ignore
return False return False