- Refactoring

git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@451 a942ae1a-1317-0410-a47c-b1dcaea8d605

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

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())

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())