From d645a8fe473a91373498229a67243248679b7a80 Mon Sep 17 00:00:00 2001 From: Cyril Jaquier Date: Thu, 6 Mar 2008 00:21:52 +0000 Subject: [PATCH] - Process failtickets as long as failmanager is not empty. git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@676 a942ae1a-1317-0410-a47c-b1dcaea8d605 --- ChangeLog | 2 +- server/filtergamin.py | 5 +++-- server/filterpoll.py | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 652d297d..f59b8d79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,7 +9,7 @@ Fail2Ban (version 0.8.3) 2008/??/?? ver. 0.8.3 (2008/??/??) - stable ---------- - +- Process failtickets as long as failmanager is not empty. ver. 0.8.2 (2008/03/06) - stable ---------- diff --git a/server/filtergamin.py b/server/filtergamin.py index a7a74e5d..5d124c7b 100644 --- a/server/filtergamin.py +++ b/server/filtergamin.py @@ -108,8 +108,9 @@ class FilterGamin(FileFilter): if self.__modified: try: - ticket = self.failManager.toBan() - self.jail.putFailTicket(ticket) + while True: + ticket = self.failManager.toBan() + self.jail.putFailTicket(ticket) except FailManagerEmpty: self.failManager.cleanup(MyTime.time()) self.dateDetector.sortTemplate() diff --git a/server/filterpoll.py b/server/filterpoll.py index 3f17fcc8..47d12a47 100644 --- a/server/filterpoll.py +++ b/server/filterpoll.py @@ -103,8 +103,9 @@ class FilterPoll(FileFilter): if self.__modified: try: - ticket = self.failManager.toBan() - self.jail.putFailTicket(ticket) + while True: + ticket = self.failManager.toBan() + self.jail.putFailTicket(ticket) except FailManagerEmpty: self.failManager.cleanup(MyTime.time()) self.dateDetector.sortTemplate()