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

@commitandrollback decorator added; missing logging module reference added;

pull/716/head
sebres 2014-07-07 10:28:46 +02:00
parent 00b7205a3c
commit e70406d5a1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fail2ban/server/database.py
View File

@ -512,7 +512,8 @@ class Fail2BanDb(object):
self._bansMergedCache[cacheKey] = tickets if ip is None else ticket
return tickets if ip is None else ticket
def getBan(self, ip, jail=None, forbantime=None, overalljails=None, fromtime=None):
@commitandrollback
def getBan(self, cur, ip, jail=None, forbantime=None, overalljails=None, fromtime=None):
if not overalljails:
query = "SELECT bancount, timeofban, bantime FROM bips"
else:
@ -531,10 +532,10 @@ class Fail2BanDb(object):
if overalljails or jail is None:
query += " GROUP BY ip ORDER BY timeofban DESC LIMIT 1"
cur = self._db.cursor()
#logSys.debug((query, queryArgs));
return cur.execute(query, queryArgs)
def _getCurrentBans(self, jail = None, ip = None, forbantime=None, fromtime=None):
@commitandrollback
def _getCurrentBans(self, cur, jail = None, ip = None, forbantime=None, fromtime=None):
if fromtime is None:
fromtime = MyTime.time()
queryArgs = []
@ -554,7 +555,6 @@ class Fail2BanDb(object):
if ip is None:
query += " GROUP BY ip ORDER BY ip, timeofban DESC"
cur = self._db.cursor()
#logSys.debug((query, queryArgs));
return cur.execute(query, queryArgs)
def getCurrentBans(self, jail = None, ip = None, forbantime=None, fromtime=None):

2
fail2ban/server/observer.py
View File

@ -26,7 +26,7 @@ __copyright__ = "Copyright (c) 2014 Serg G. Brester"
__license__ = "GPL"
import threading
import os, time, datetime, math, json, random
import os, logging, time, datetime, math, json, random
import sys
from ..helpers import getLogger
from .mytime import MyTime