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

database: stability fix - repack cursor iterator as long as locked

pull/1557/head
sebres 2016-09-09 17:36:01 +02:00
parent f6197200a9
commit a20f325f80
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fail2ban/server/database.py
View File

@ -482,7 +482,8 @@ class Fail2BanDb(object):
queryArgs.append(str(ip)) queryArgs.append(str(ip))
query += " ORDER BY ip, timeofban desc" query += " ORDER BY ip, timeofban desc"
return cur.execute(query, queryArgs) # repack iterator as long as in lock:
return list(cur.execute(query, queryArgs))
def getBans(self, **kwargs): def getBans(self, **kwargs):
"""Get bans from the database. """Get bans from the database.
@ -581,7 +582,6 @@ class Fail2BanDb(object):
self._bansMergedCache[cacheKey] = tickets if ip is None else ticket self._bansMergedCache[cacheKey] = tickets if ip is None else ticket
return tickets if ip is None else ticket return tickets if ip is None else ticket
@commitandrollback
def _getCurrentBans(self, cur, jail = None, ip = None, forbantime=None, fromtime=None): def _getCurrentBans(self, cur, jail = None, ip = None, forbantime=None, fromtime=None):
if fromtime is None: if fromtime is None:
fromtime = MyTime.time() fromtime = MyTime.time()
@ -606,7 +606,9 @@ class Fail2BanDb(object):
tickets = [] tickets = []
ticket = None ticket = None
results = list(self._getCurrentBans(jail=jail, ip=ip, forbantime=forbantime, fromtime=fromtime)) with self._lock:
results = list(self._getCurrentBans(self._db.cursor(),
jail=jail, ip=ip, forbantime=forbantime, fromtime=fromtime))
if results: if results:
for banip, timeofban, data in results: for banip, timeofban, data in results: