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

BF+TST: isStarted was not checking __asyncServer for exist before checking it

pull/1483/head
Yaroslav Halchenko 2016-07-12 22:53:37 -04:00
parent 52cd8a9a96
commit dfcf6f1963
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fail2ban/server/server.py
View File

@ -60,7 +60,7 @@ def _thread_name():
class Server: class Server:
def __init__(self, daemon = False): def __init__(self, daemon=False):
self.__loggingLock = Lock() self.__loggingLock = Lock()
self.__lock = RLock() self.__lock = RLock()
self.__jails = Jails() self.__jails = Jails()
@ -377,7 +377,7 @@ class Server:
return self.__jails[name].actions.getBanTime() return self.__jails[name].actions.getBanTime()
def isStarted(self): def isStarted(self):
self.__asyncServer.isActive() return self.__asyncServer is not None and self.__asyncServer.isActive()
def isAlive(self, jailnum=None): def isAlive(self, jailnum=None):
if jailnum is not None and len(self.__jails) != jailnum: if jailnum is not None and len(self.__jails) != jailnum:

4
fail2ban/tests/servertestcase.py
View File

@ -158,6 +158,9 @@ class Transmitter(TransmitterBase):
def setUp(self): def setUp(self):
self.server = TestServer() self.server = TestServer()
super(Transmitter, self).setUp() super(Transmitter, self).setUp()
# so far isStarted only tested but not used otherwise
# and here we don't really .start server
self.assertFalse(self.server.isStarted())
def testStopServer(self): def testStopServer(self):
self.assertEqual(self.transm.proceed(["stop"]), (0, None)) self.assertEqual(self.transm.proceed(["stop"]), (0, None))
@ -1004,6 +1007,7 @@ class LoggingTests(LogCaptureTestCase):
server = TestServer() server = TestServer()
try: try:
server.start(sock_name, pidfile_name, force=False) server.start(sock_name, pidfile_name, force=False)
self.assertFalse(server.isStarted())
self.assertLogged("Server already running") self.assertLogged("Server already running")
finally: finally:
server.quit() server.quit()