explicitly close cursor if not needed anymore (GC can grab it late)

0.10
sebres 2022-09-16 18:32:19 +02:00
parent 45ef36276f
commit 485c50228a
1 changed files with 28 additions and 22 deletions

View File

@ -104,7 +104,11 @@ def commitandrollback(f):
def wrapper(self, *args, **kwargs): def wrapper(self, *args, **kwargs):
with self._lock: # Threading lock with self._lock: # Threading lock
with self._db: # Auto commit and rollback on exception 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 return wrapper
@ -747,14 +751,15 @@ class Fail2BanDb(object):
query += " GROUP BY ip ORDER BY ip, timeofban DESC" query += " GROUP BY ip ORDER BY ip, timeofban DESC"
else: else:
query += " ORDER BY timeofban DESC LIMIT 1" query += " ORDER BY timeofban DESC LIMIT 1"
cur = self._db.cursor()
return cur.execute(query, queryArgs) return cur.execute(query, queryArgs)
def getCurrentBans(self, jail = None, ip = None, forbantime=None, fromtime=None, maxmatches=None): def getCurrentBans(self, jail = None, ip = None, forbantime=None, fromtime=None, maxmatches=None):
tickets = [] tickets = []
ticket = None ticket = None
try:
with self._lock: with self._lock:
cur = self._db.cursor()
results = list(self._getCurrentBans(self._db.cursor(), results = list(self._getCurrentBans(self._db.cursor(),
jail=jail, ip=ip, forbantime=forbantime, fromtime=fromtime)) jail=jail, ip=ip, forbantime=forbantime, fromtime=fromtime))
@ -774,7 +779,8 @@ class Fail2BanDb(object):
# logSys.debug('restored ticket: %r', ticket) # logSys.debug('restored ticket: %r', ticket)
if ip is not None: return ticket if ip is not None: return ticket
tickets.append(ticket) tickets.append(ticket)
finally:
cur.close()
return tickets return tickets
@commitandrollback @commitandrollback