github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity

- Fixes in locking 

git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@366 a942ae1a-1317-0410-a47c-b1dcaea8d605
0.x
Cyril Jaquier 2006-09-17 22:53:59 +00:00
parent 0d68fc9ef1
commit acb2fc2c2b
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/banmanager.py
View File

@ -110,16 +110,12 @@ class BanManager:
@staticmethod @staticmethod
def createBanTicket(ticket): def createBanTicket(ticket):
try:
self.lock.acquire()
ip = ticket.getIP() ip = ticket.getIP()
#lastTime = ticket.getTime() #lastTime = ticket.getTime()
lastTime = time.time() lastTime = time.time()
banTicket = BanTicket(ip, lastTime) banTicket = BanTicket(ip, lastTime)
banTicket.setAttempt(ticket.getAttempt()) banTicket.setAttempt(ticket.getAttempt())
return banTicket return banTicket
finally:
self.lock.release()
## ##
# Add a ban ticket. # Add a ban ticket.

2
server/jail.py
View File

@ -91,9 +91,9 @@ class Jail:
self.lock.release() self.lock.release()
def getFailTicket(self): def getFailTicket(self):
try:
try: try:
self.lock.acquire() self.lock.acquire()
try:
return self.queue.get(False) return self.queue.get(False)
except Queue.Empty: except Queue.Empty:
return False return False