diff --git a/server/banmanager.py b/server/banmanager.py index 1e123f7c..252fac3a 100644 --- a/server/banmanager.py +++ b/server/banmanager.py @@ -131,7 +131,7 @@ class BanManager: def addBanTicket(self, ticket): try: self.lock.acquire() - if not self.inBanList(ticket): + if not self.__inBanList(ticket): self.banList.append(ticket) self.banTotal += 1 return True @@ -168,15 +168,11 @@ class BanManager: # @param ticket the ticket # @return True if a ticket already exists - def inBanList(self, ticket): - try: - self.lock.acquire() - for i in self.banList: - if ticket.getIP() == i.getIP(): - return True - return False - finally: - self.lock.release() + def __inBanList(self, ticket): + for i in self.banList: + if ticket.getIP() == i.getIP(): + return True + return False ## # Get the list of IP address to unban. diff --git a/server/failmanager.py b/server/failmanager.py index 46dbe258..aa2a1b0d 100644 --- a/server/failmanager.py +++ b/server/failmanager.py @@ -118,7 +118,7 @@ class FailManager: for ip in self.failList: data = self.failList[ip] if data.getRetry() >= self.maxRetry: - self.delFailure(ip) + self.__delFailure(ip) # Create a FailTicket from BanData failTicket = FailTicket(ip, data.getLastTime()) failTicket.setAttempt(data.getRetry())