diff options
| author | sebres <serg.brester@sebres.de> | 2015-09-01 20:10:47 +0200 |
|---|---|---|
| committer | sebres <serg.brester@sebres.de> | 2015-11-02 14:04:57 +0100 |
| commit | af4b13115b91726a854e70eb68d91cf8f5eeedf5 (patch) | |
| tree | 6ad3bb99f3d8ad20d03b0a8df494dc3083d6fb29 | |
| parent | 4dc774492720110c59e931a04c24dc2c1560d010 (diff) | |
| download | fail2ban-f2b-perfom-prepare-716.tar.gz | |
code and config review after rebase to current masterf2b-perfom-prepare-716
| -rw-r--r-- | fail2ban/server/server.py | 5 | ||||
| -rw-r--r-- | fail2ban/tests/filtertestcase.py | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/fail2ban/server/server.py b/fail2ban/server/server.py index 8dc1b761..ca06973d 100644 --- a/fail2ban/server/server.py +++ b/fail2ban/server/server.py @@ -327,9 +327,8 @@ class Server: def isAlive(self, jailnum=None): if jailnum is not None and len(self.__jails) != jailnum: return 0 - for j in self.__jails: - j = self.__jails[j] - if not j.isAlive(): + for jail in self.__jails.values(): + if not jail.isAlive(): return 0 return 1 diff --git a/fail2ban/tests/filtertestcase.py b/fail2ban/tests/filtertestcase.py index 7557f520..ab0f0462 100644 --- a/fail2ban/tests/filtertestcase.py +++ b/fail2ban/tests/filtertestcase.py @@ -1231,9 +1231,9 @@ class DNSUtilsNetworkTests(unittest.TestCase): self.assertEqual(res, []) def testIpToName(self): + unittest.F2B.SkipIfNoNetwork() res = DNSUtils.ipToName('8.8.4.4') self.assertEqual(res, 'google-public-dns-b.google.com') - unittest.F2B.SkipIfNoNetwork() # invalid ip (TEST-NET-1 according to RFC 5737) res = DNSUtils.ipToName('192.0.2.0') self.assertEqual(res, None) |