diff options
| author | sebres <serg.brester@sebres.de> | 2021-11-03 15:58:57 +0100 |
|---|---|---|
| committer | sebres <serg.brester@sebres.de> | 2021-11-03 15:58:57 +0100 |
| commit | 4fe4ac8dde6ba14841da598ec37f8c6911fe0f64 (patch) | |
| tree | 2b55f6d042215fe9515246d7e34b4eb00aec9be3 /fail2ban | |
| parent | 0b3ad780fed0e3582de0215f41a0f8790c590ccf (diff) | |
| download | fail2ban-4fe4ac8dde6ba14841da598ec37f8c6911fe0f64.tar.gz | |
amend to merge: replace timedelta string representation with new function seconds2str
Diffstat (limited to 'fail2ban')
| -rw-r--r-- | fail2ban/server/observer.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fail2ban/server/observer.py b/fail2ban/server/observer.py index f5ba20d9..b585706f 100644 --- a/fail2ban/server/observer.py +++ b/fail2ban/server/observer.py @@ -462,7 +462,7 @@ class ObserverThread(JailThread): if ticket.getTime() > timeOfBan: logSys.info('[%s] IP %s is bad: %s # last %s - incr %s to %s' % (jail.name, ip, banCount, MyTime.time2str(timeOfBan), - datetime.timedelta(seconds=int(orgBanTime)), datetime.timedelta(seconds=int(banTime)))); + MyTime.seconds2str(orgBanTime), MyTime.seconds2str(banTime))) else: ticket.restored = True break @@ -491,8 +491,7 @@ class ObserverThread(JailThread): # if not permanent if btime != -1: bendtime = ticket.getTime() + btime - logtime = (datetime.timedelta(seconds=int(btime)), - MyTime.time2str(bendtime)) + logtime = (MyTime.seconds2str(btime), MyTime.time2str(bendtime)) # check ban is not too old : if bendtime < MyTime.time(): logSys.debug('Ignore old bantime %s', logtime[1]) |