mirror of https://github.com/fail2ban/fail2ban
explicitly close cursor if not needed anymore (GC can grab it late)
parent
45ef36276f
commit
485c50228a
|
@ -104,7 +104,11 @@ def commitandrollback(f):
|
|||
def wrapper(self, *args, **kwargs):
|
||||
with self._lock: # Threading lock
|
||||
with self._db: # Auto commit and rollback on exception
|
||||
return f(self, self._db.cursor(), *args, **kwargs)
|
||||
cur = self._db.cursor()
|
||||
try:
|
||||
return f(self, cur, *args, **kwargs)
|
||||
finally:
|
||||
cur.close()
|
||||
return wrapper
|
||||
|
||||
|
||||
|
@ -747,14 +751,15 @@ class Fail2BanDb(object):
|
|||
query += " GROUP BY ip ORDER BY ip, timeofban DESC"
|
||||
else:
|
||||
query += " ORDER BY timeofban DESC LIMIT 1"
|
||||
cur = self._db.cursor()
|
||||
return cur.execute(query, queryArgs)
|
||||
|
||||
def getCurrentBans(self, jail = None, ip = None, forbantime=None, fromtime=None, maxmatches=None):
|
||||
tickets = []
|
||||
ticket = None
|
||||
|
||||
try:
|
||||
with self._lock:
|
||||
cur = self._db.cursor()
|
||||
results = list(self._getCurrentBans(self._db.cursor(),
|
||||
jail=jail, ip=ip, forbantime=forbantime, fromtime=fromtime))
|
||||
|
||||
|
@ -774,7 +779,8 @@ class Fail2BanDb(object):
|
|||
# logSys.debug('restored ticket: %r', ticket)
|
||||
if ip is not None: return ticket
|
||||
tickets.append(ticket)
|
||||
|
||||
finally:
|
||||
cur.close()
|
||||
return tickets
|
||||
|
||||
@commitandrollback
|
||||
|
|
Loading…
Reference in New Issue