From: <los...@us...> - 2007-02-01 20:53:24
|
Revision: 537 http://svn.sourceforge.net/fail2ban/?rev=537&view=rev Author: lostcontrol Date: 2007-02-01 12:50:12 -0800 (Thu, 01 Feb 2007) Log Message: ----------- - Removed IP list in status for failmanager Modified Paths: -------------- trunk/client/beautifier.py trunk/server/failmanager.py trunk/server/filter.py Modified: trunk/client/beautifier.py =================================================================== --- trunk/client/beautifier.py 2007-01-31 22:31:42 UTC (rev 536) +++ trunk/client/beautifier.py 2007-02-01 20:50:12 UTC (rev 537) @@ -71,7 +71,6 @@ 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" Modified: trunk/server/failmanager.py =================================================================== --- trunk/server/failmanager.py 2007-01-31 22:31:42 UTC (rev 536) +++ trunk/server/failmanager.py 2007-02-01 20:50:12 UTC (rev 537) @@ -77,18 +77,6 @@ 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() Modified: trunk/server/filter.py =================================================================== --- trunk/server/filter.py 2007-01-31 22:31:42 UTC (rev 536) +++ trunk/server/filter.py 2007-02-01 20:50:12 UTC (rev 537) @@ -463,8 +463,7 @@ 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |