diff --git a/client/beautifier.py b/client/beautifier.py index e6eb6c27c..b31cc2669 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 4d7fcbdf3..2a43c9f17 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 f47055627..ed63299d9 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