From e70406d5a17f5dd01bd09a52142eaf4895c521e4 Mon Sep 17 00:00:00 2001 From: sebres Date: Mon, 7 Jul 2014 10:28:46 +0200 Subject: [PATCH] @commitandrollback decorator added; missing logging module reference added; --- fail2ban/server/database.py | 8 ++++---- fail2ban/server/observer.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fail2ban/server/database.py b/fail2ban/server/database.py index 53ec87ba..1f4f7ca8 100644 --- a/fail2ban/server/database.py +++ b/fail2ban/server/database.py @@ -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): diff --git a/fail2ban/server/observer.py b/fail2ban/server/observer.py index 40751941..2db8144d 100644 --- a/fail2ban/server/observer.py +++ b/fail2ban/server/observer.py @@ -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