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

code and config review after rebase to current master

f2b-perfom-prepare-716
sebres 2015-09-01 20:10:47 +02:00
parent 4dc7744927
commit af4b13115b
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fail2ban/server/server.py
View File

@ -327,9 +327,8 @@ class Server:
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:
return 0 return 0
for j in self.__jails: for jail in self.__jails.values():
j = self.__jails[j] if not jail.isAlive():
if not j.isAlive():
return 0 return 0
return 1 return 1

2
fail2ban/tests/filtertestcase.py
View File

@ -1231,9 +1231,9 @@ class DNSUtilsNetworkTests(unittest.TestCase):
self.assertEqual(res, []) self.assertEqual(res, [])
def testIpToName(self): def testIpToName(self):
unittest.F2B.SkipIfNoNetwork()
res = DNSUtils.ipToName('8.8.4.4') res = DNSUtils.ipToName('8.8.4.4')
self.assertEqual(res, 'google-public-dns-b.google.com') self.assertEqual(res, 'google-public-dns-b.google.com')
unittest.F2B.SkipIfNoNetwork()
# invalid ip (TEST-NET-1 according to RFC 5737) # invalid ip (TEST-NET-1 according to RFC 5737)
res = DNSUtils.ipToName('192.0.2.0') res = DNSUtils.ipToName('192.0.2.0')
self.assertEqual(res, None) self.assertEqual(res, None)