github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity

- Refactoring 

git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@451 a942ae1a-1317-0410-a47c-b1dcaea8d605
0.x
Cyril Jaquier 2006-11-06 22:47:24 +00:00
parent dc0ae5ee0f
commit 7659452ade
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/filter.py
View File

@ -56,7 +56,6 @@ class Filter(JailThread):
self.jail = jail self.jail = jail
## The failures manager. ## The failures manager.
self.failManager = FailManager() self.failManager = FailManager()
self.modified = False
## The log file handler. ## The log file handler.
self.__crtHandler = None self.__crtHandler = None
self.__crtFilename = None self.__crtFilename = None

7
server/filtergamin.py
View File

@ -50,6 +50,7 @@ class FilterGamin(Filter):
def __init__(self, jail): def __init__(self, jail):
Filter.__init__(self, jail) Filter.__init__(self, jail)
self.__modified = False
# Gamin monitor # Gamin monitor
self.monitor = gamin.WatchMonitor() self.monitor = gamin.WatchMonitor()
logSys.info("Created FilterGamin") logSys.info("Created FilterGamin")
@ -60,7 +61,7 @@ class FilterGamin(Filter):
if event in (gamin.GAMCreated, gamin.GAMChanged, gamin.GAMExists): if event in (gamin.GAMCreated, gamin.GAMChanged, gamin.GAMExists):
logSys.debug("File changed: " + path) logSys.debug("File changed: " + path)
self.getFailures(path) self.getFailures(path)
self.modified = True self.__modified = True
## ##
@ -105,14 +106,14 @@ class FilterGamin(Filter):
if self.monitor.event_pending(): if self.monitor.event_pending():
self.monitor.handle_events() self.monitor.handle_events()
if self.modified: if self.__modified:
try: try:
ticket = self.failManager.toBan() ticket = self.failManager.toBan()
self.jail.putFailTicket(ticket) self.jail.putFailTicket(ticket)
except FailManagerEmpty: except FailManagerEmpty:
self.failManager.cleanup(MyTime.time()) self.failManager.cleanup(MyTime.time())
self.dateDetector.sortTemplate() self.dateDetector.sortTemplate()
self.modified = False self.__modified = False
time.sleep(self.getSleepTime()) time.sleep(self.getSleepTime())
else: else:
time.sleep(self.getSleepTime()) time.sleep(self.getSleepTime())

7
server/filterpoll.py
View File

@ -50,6 +50,7 @@ class FilterPoll(Filter):
def __init__(self, jail): def __init__(self, jail):
Filter.__init__(self, jail) Filter.__init__(self, jail)
self.__modified = False
## The time of the last modification of the file. ## The time of the last modification of the file.
self.__lastModTime = dict() self.__lastModTime = dict()
self.__file404Cnt = dict() self.__file404Cnt = dict()
@ -98,16 +99,16 @@ class FilterPoll(Filter):
for f in self.getLogPath(): for f in self.getLogPath():
if self.isModified(f): if self.isModified(f):
self.getFailures(f) self.getFailures(f)
self.modified = True self.__modified = True
if self.modified: if self.__modified:
try: try:
ticket = self.failManager.toBan() ticket = self.failManager.toBan()
self.jail.putFailTicket(ticket) self.jail.putFailTicket(ticket)
except FailManagerEmpty: except FailManagerEmpty:
self.failManager.cleanup(MyTime.time()) self.failManager.cleanup(MyTime.time())
self.dateDetector.sortTemplate() self.dateDetector.sortTemplate()
self.modified = False self.__modified = False
time.sleep(self.getSleepTime()) time.sleep(self.getSleepTime())
else: else:
time.sleep(self.getSleepTime()) time.sleep(self.getSleepTime())