From c2ed2b213d1affd5706a437850e6421a0c87b694 Mon Sep 17 00:00:00 2001
From: Thuban <thuban@yeuxdelibad.net>
Date: Wed, 01 Nov 2017 21:57:05 +0000
Subject: [PATCH] Merge branch 'master' of framagit.org:Thuban/vilain
---
vilain.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/vilain.py b/vilain.py
index eb3a608..082b15f 100755
--- a/vilain.py
+++ b/vilain.py
@@ -30,7 +30,7 @@
import time
CONFIGFILE = "/etc/vilain.conf"
-VERSION = "0.6"
+VERSION = "0.7"
vilain_table = "vilain_bruteforce"
LOGFILE = "/var/log/daemon"
@@ -46,7 +46,7 @@
log_handler = logging.handlers.WatchedFileHandler(LOGFILE)
formatter = logging.Formatter(
'%(asctime)s %(module)s:%(funcName)s:%(message)s',
- '%b %d %H:%M:%S')
+ '%Y-%m-%d %H:%M:%S')
log_handler.setFormatter(formatter)
logger.addHandler(log_handler)
logger.setLevel(logging.INFO)
@@ -182,7 +182,7 @@
logger.info("{} detected, reason {}, count: {}, maxtries: {}".format(ip, reason, n_ip, maxtries))
if n_ip >= maxtries:
ret = subprocess.call(["pfctl", "-t", self.vilain_table, "-T", "add", ip])
- logger.info("Blacklisting {}, return code:{}".format(ip, ret))
+ logger.info("Blacklisting {}, reason {}, return code:{}".format(ip, reason, ret))
#for debugging, this line allow us to see if the script run until here
logger.debug('ban_ips end:{}'.format(self.ip_seen_at))
--
Gitblit v1.9.3