Merge pull request #472 from grooverdan/banip-ignoreconflict

ENH: banning an IP in the ignoreIPList now issues warning to log, but still does the ban
pull/478/head
Daniel Black 2013-12-05 12:45:13 -08:00
commit 4780451883
1 changed files with 3 additions and 0 deletions

View File

@ -219,6 +219,9 @@ class Filter(JailThread):
# to enable banip fail2ban-client BAN command
def addBannedIP(self, ip):
if self.inIgnoreIPList(ip):
logSys.warning('Requested to manually ban an ignored IP ' + ip + '. User knows best. Proceeding to ban it.')
unixTime = MyTime.time()
for i in xrange(self.failManager.getMaxRetry()):
self.failManager.addFailure(FailTicket(ip, unixTime))