From bcdb428e1bf2cc3725f21fbb42e7937779af6e13 Mon Sep 17 00:00:00 2001 From: Cyril Jaquier Date: Sat, 2 Feb 2008 17:04:11 +0000 Subject: [PATCH] - Added missing argument. - Fixed use of FileContainer in filterpoll.py. git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@649 a942ae1a-1317-0410-a47c-b1dcaea8d605 --- server/filtergamin.py | 4 ++-- server/filterpoll.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/filtergamin.py b/server/filtergamin.py index 6c4a20ca..a7a74e5d 100644 --- a/server/filtergamin.py +++ b/server/filtergamin.py @@ -69,12 +69,12 @@ class FilterGamin(FileFilter): # # @param path log file path - def addLogPath(self, path): + def addLogPath(self, path, tail = False): if self.containsLogPath(path): logSys.error(path + " already exists") else: self.monitor.watch_file(path, self.callback) - FileFilter.addLogPath(self, path) + FileFilter.addLogPath(self, path, tail) logSys.info("Added logfile = %s" % path) ## diff --git a/server/filterpoll.py b/server/filterpoll.py index b06f943b..3f17fcc8 100644 --- a/server/filterpoll.py +++ b/server/filterpoll.py @@ -61,13 +61,13 @@ class FilterPoll(FileFilter): # # @param path log file path - def addLogPath(self, path): + def addLogPath(self, path, tail = False): if self.containsLogPath(path): logSys.error(path + " already exists") else: self.__lastModTime[path] = 0 self.__file404Cnt[path] = 0 - FileFilter.addLogPath(self, path) + FileFilter.addLogPath(self, path, tail) logSys.info("Added logfile = %s" % path) ## @@ -96,9 +96,9 @@ class FilterPoll(FileFilter): while self._isActive(): if not self.getIdle(): # Get file modification - for f in self.getLogPath(): - if self.isModified(f): - self.getFailures(f) + for container in self.getLogPath(): + if self.isModified(container.getFileName()): + self.getFailures(container.getFileName()) self.__modified = True if self.__modified: