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

observer: logging optimized, some log messages switched to debug level (because long time stable)

pull/716/head
sebres 2014-09-24 15:22:48 +02:00
parent 145a9fb891
commit 7688db2628
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fail2ban/server/observer.py
View File

@ -342,7 +342,7 @@ class ObserverThread(JailThread):
return return
ip = ticket.getIP() ip = ticket.getIP()
unixTime = ticket.getTime() unixTime = ticket.getTime()
logSys.info("[%s] Observer: failure found %s", jail.name, ip) logSys.debug("[%s] Observer: failure found %s", jail.name, ip)
# increase retry count for known (bad) ip, corresponding banCount of it (one try will count than 2, 3, 5, 9 ...) : # increase retry count for known (bad) ip, corresponding banCount of it (one try will count than 2, 3, 5, 9 ...) :
banCount = 0 banCount = 0
retryCount = 1 retryCount = 1
@ -359,8 +359,8 @@ class ObserverThread(JailThread):
retryCount = min(retryCount, maxRetry) retryCount = min(retryCount, maxRetry)
# check this ticket already known (line was already processed and in the database and will be restored from there): # check this ticket already known (line was already processed and in the database and will be restored from there):
if timeOfBan is not None and unixTime <= timeOfBan: if timeOfBan is not None and unixTime <= timeOfBan:
logSys.info("[%s] Ignore failure %s before last ban %s < %s, restored" logSys.debug("[%s] Ignore failure %s before last ban %s < %s, restored",
% (jail.name, ip, unixTime, timeOfBan)) jail.name, ip, unixTime, timeOfBan)
return return
# for not increased failures observer should not add it to fail manager, because was already added by filter self # for not increased failures observer should not add it to fail manager, because was already added by filter self
if retryCount <= 1: if retryCount <= 1:
@ -420,7 +420,7 @@ class ObserverThread(JailThread):
for banCount, timeOfBan, lastBanTime in \ for banCount, timeOfBan, lastBanTime in \
jail.database.getBan(ip, jail, overalljails=be.get('overalljails', False)) \ jail.database.getBan(ip, jail, overalljails=be.get('overalljails', False)) \
: :
logSys.debug('IP %s was already banned: %s #, %s' % (ip, banCount, timeOfBan)); logSys.debug('IP %s was already banned: %s #, %s', ip, banCount, timeOfBan);
ticket.setBanCount(banCount); ticket.setBanCount(banCount);
# calculate new ban time # calculate new ban time
if banCount > 0: if banCount > 0:
@ -447,7 +447,7 @@ class ObserverThread(JailThread):
""" """
oldbtime = btime oldbtime = btime
ip = ticket.getIP() ip = ticket.getIP()
logSys.info("[%s] Observer: ban found %s, %s", jail.name, ip, btime) logSys.debug("[%s] Observer: ban found %s, %s", jail.name, ip, btime)
try: try:
# if not permanent, not restored and ban time was not set - check time should be increased: # if not permanent, not restored and ban time was not set - check time should be increased:
if btime != -1 and not ticket.getRestored() and ticket.getBanTime() is None: if btime != -1 and not ticket.getRestored() and ticket.getBanTime() is None:
@ -462,7 +462,7 @@ class ObserverThread(JailThread):
datetime.datetime.fromtimestamp(bendtime).strftime("%Y-%m-%d %H:%M:%S")) datetime.datetime.fromtimestamp(bendtime).strftime("%Y-%m-%d %H:%M:%S"))
# check ban is not too old : # check ban is not too old :
if bendtime < MyTime.time(): if bendtime < MyTime.time():
logSys.info('Ignore old bantime %s', logtime[1]) logSys.debug('Ignore old bantime %s', logtime[1])
return False return False
else: else:
logtime = ('permanent', 'infinite') logtime = ('permanent', 'infinite')