From 04e2b6730c5a71fc9be542dcf553aeaa68ad2a79 Mon Sep 17 00:00:00 2001 From: Cyril Jaquier Date: Thu, 1 Feb 2007 20:50:12 +0000 Subject: [PATCH] - Removed IP list in status for failmanager git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@537 a942ae1a-1317-0410-a47c-b1dcaea8d605 --- client/beautifier.py | 1 - server/failmanager.py | 12 ------------ server/filter.py | 3 +-- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/client/beautifier.py b/client/beautifier.py index e6eb6c27..b31cc266 100644 --- a/client/beautifier.py +++ b/client/beautifier.py @@ -71,7 +71,6 @@ class Beautifier: msg = "Status for the jail: " + inC[1] + "\n" msg = msg + "|- " + response[0][0] + "\n" msg = msg + "| |- " + response[0][1][0][0] + ":\t" + `response[0][1][0][1]` + "\n" - msg = msg + "| | `- " + response[0][1][2][0] + ":\t" + `response[0][1][2][1]` + "\n" msg = msg + "| `- " + response[0][1][1][0] + ":\t" + `response[0][1][1][1]` + "\n" msg = msg + "`- " + response[1][0] + "\n" msg = msg + " |- " + response[1][1][0][0] + ":\t" + `response[1][1][0][1]` + "\n" diff --git a/server/failmanager.py b/server/failmanager.py index 4d7fcbdf..2a43c9f1 100644 --- a/server/failmanager.py +++ b/server/failmanager.py @@ -77,18 +77,6 @@ class FailManager: finally: self.__lock.release() - ## - # Returns a copy of the IP list. - # - # @return IP list - - def getBanList(self): - try: - self.__lock.acquire() - return [m.getIP() for m in self.__failList] - finally: - self.__lock.release() - def addFailure(self, ticket): self.__lock.acquire() ip = ticket.getIP() diff --git a/server/filter.py b/server/filter.py index f4705562..ed63299d 100644 --- a/server/filter.py +++ b/server/filter.py @@ -463,8 +463,7 @@ class Filter(JailThread): def status(self): ret = [("Currently failed", self.failManager.size()), - ("Total failed", self.failManager.getFailTotal()), - ("IP List", self.failManager.getBanList())] + ("Total failed", self.failManager.getFailTotal())] return ret