From 7659452ade29c719f88269ea401387afdce378dc Mon Sep 17 00:00:00 2001 From: Cyril Jaquier Date: Mon, 6 Nov 2006 22:47:24 +0000 Subject: [PATCH] - Refactoring git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@451 a942ae1a-1317-0410-a47c-b1dcaea8d605 --- server/filter.py | 1 - server/filtergamin.py | 7 ++++--- server/filterpoll.py | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/server/filter.py b/server/filter.py index afd573c7..8c565f9b 100644 --- a/server/filter.py +++ b/server/filter.py @@ -56,7 +56,6 @@ class Filter(JailThread): self.jail = jail ## The failures manager. self.failManager = FailManager() - self.modified = False ## The log file handler. self.__crtHandler = None self.__crtFilename = None diff --git a/server/filtergamin.py b/server/filtergamin.py index 54c66d74..d0f8adcb 100644 --- a/server/filtergamin.py +++ b/server/filtergamin.py @@ -50,6 +50,7 @@ class FilterGamin(Filter): def __init__(self, jail): Filter.__init__(self, jail) + self.__modified = False # Gamin monitor self.monitor = gamin.WatchMonitor() logSys.info("Created FilterGamin") @@ -60,7 +61,7 @@ class FilterGamin(Filter): if event in (gamin.GAMCreated, gamin.GAMChanged, gamin.GAMExists): logSys.debug("File changed: " + path) self.getFailures(path) - self.modified = True + self.__modified = True ## @@ -105,14 +106,14 @@ class FilterGamin(Filter): if self.monitor.event_pending(): self.monitor.handle_events() - if self.modified: + if self.__modified: try: ticket = self.failManager.toBan() self.jail.putFailTicket(ticket) except FailManagerEmpty: self.failManager.cleanup(MyTime.time()) self.dateDetector.sortTemplate() - self.modified = False + self.__modified = False time.sleep(self.getSleepTime()) else: time.sleep(self.getSleepTime()) diff --git a/server/filterpoll.py b/server/filterpoll.py index 4aa07423..374d957d 100644 --- a/server/filterpoll.py +++ b/server/filterpoll.py @@ -50,6 +50,7 @@ class FilterPoll(Filter): def __init__(self, jail): Filter.__init__(self, jail) + self.__modified = False ## The time of the last modification of the file. self.__lastModTime = dict() self.__file404Cnt = dict() @@ -98,16 +99,16 @@ class FilterPoll(Filter): for f in self.getLogPath(): if self.isModified(f): self.getFailures(f) - self.modified = True + self.__modified = True - if self.modified: + if self.__modified: try: ticket = self.failManager.toBan() self.jail.putFailTicket(ticket) except FailManagerEmpty: self.failManager.cleanup(MyTime.time()) self.dateDetector.sortTemplate() - self.modified = False + self.__modified = False time.sleep(self.getSleepTime()) else: time.sleep(self.getSleepTime())