- Fixed "reload" bug. Many many thanks to Yaroslav Halchenko

git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@567 a942ae1a-1317-0410-a47c-b1dcaea8d605
0.x
Cyril Jaquier 2007-03-26 21:17:31 +00:00
parent b40b9d88d2
commit 090518ddaf
8 changed files with 15 additions and 14 deletions

View File

@ -10,6 +10,7 @@ Fail2Ban (version 0.?.?) 2007/??/??
ver. 0.?.? (2007/??/??) - ???
----------
- Close opened handlers. Thanks to Yaroslav Halchenko
- Fixed "reload" bug. Many many thanks to Yaroslav Halchenko
ver. 0.7.8 (2007/03/21) - release candidate
----------

View File

@ -125,10 +125,10 @@ class Actions(JailThread):
# @return True when the thread exits nicely
def run(self):
self.setActive(True)
for action in self.__actions:
action.execActionStart()
self.setActive(True)
while self.isActive():
while self._isActive():
if not self.getIdle():
#logSys.debug(self.jail.getName() + ": action")
ret = self.__checkBan()

View File

@ -385,7 +385,7 @@ class Filter(JailThread):
self.__setFilePos()
lastLine = None
for line in self.__crtHandler:
if not self.isActive():
if not self._isActive():
# The jail has been stopped
break
try:

View File

@ -99,7 +99,7 @@ class FilterGamin(Filter):
def run(self):
self.setActive(True)
while self.isActive():
while self._isActive():
if not self.getIdle():
# We cannot block here because we want to be able to
# exit.

View File

@ -93,7 +93,7 @@ class FilterPoll(Filter):
def run(self):
self.setActive(True)
while self.isActive():
while self._isActive():
if not self.getIdle():
# Get file modification
for f in self.getLogPath():

View File

@ -89,10 +89,10 @@ class Jail:
self.__filter.join()
self.__action.join()
def isActive(self):
isActive0 = self.__filter.isActive()
isActive1 = self.__action.isActive()
return isActive0 or isActive1
def isAlive(self):
isAlive0 = self.__filter.isAlive()
isAlive1 = self.__action.isAlive()
return isAlive0 or isAlive1
def setIdle(self, value):
self.__filter.setIdle(value)

View File

@ -105,7 +105,7 @@ class JailThread(Thread):
# Check if the filter thread is running.
# @return True if the thread is running
def isActive(self):
def _isActive(self):
return self.__isRunning
##

View File

@ -96,7 +96,7 @@ class Server:
def startJail(self, name):
try:
self.__lock.acquire()
if not self.isActive(name):
if not self.isAlive(name):
self.__jails.get(name).start()
finally:
self.__lock.release()
@ -104,7 +104,7 @@ class Server:
def stopJail(self, name):
try:
self.__lock.acquire()
if self.isActive(name):
if self.isAlive(name):
self.__jails.get(name).stop()
self.delJail(name)
finally:
@ -118,8 +118,8 @@ class Server:
finally:
self.__lock.release()
def isActive(self, name):
return self.__jails.get(name).isActive()
def isAlive(self, name):
return self.__jails.get(name).isAlive()
def setIdleJail(self, name, value):
self.__jails.get(name).setIdle(value)