kwirk

diff --git a/src/python-systemd/_reader.c b/src/python-systemd/_reader.c
index a49527f..a4568a8 100644
--- a/src/python-systemd/_reader.c
+++ b/src/python-systemd/_reader.c
@@ -260,6 +260,21 @@ static PyObject* Reader_next(Reader *self, PyObject *args)
     return PyBool_FromLong(r);
 }
 
+PyDoc_STRVAR(Reader_previous__doc__,
+             "previous([skip]) -> bool\n\n"

kwirk

diff --git a/server/datedetector.py b/server/datedetector.py
index a54e072..2976450 100644
--- a/server/datedetector.py
+++ b/server/datedetector.py
@@ -161,6 +161,12 @@ class DateDetector:
 			template.setRegex("^\d{2}\d{2}\d{2} +\d{1,2}:\d{2}:\d{2}")
 			template.setPattern("%y%m%d %H:%M:%S")
 			self._appendTemplate(template)
+			# Apache Tomcat
+			template = DateStrptime()

kwirk

diff --git a/fail2ban/server/action.py b/fail2ban/server/action.py
index 6c36bbc..38c2c00 100644
--- a/fail2ban/server/action.py
+++ b/fail2ban/server/action.py
@@ -27,7 +27,7 @@ __date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"
 
-import logging, os, subprocess, time, signal
+import logging, os, subprocess, time, signal, tempfile

kwirk

diff --git a/fail2ban/server/action.py b/fail2ban/server/action.py
index 6c36bbc..2b8acd5 100644
--- a/fail2ban/server/action.py
+++ b/fail2ban/server/action.py
@@ -27,7 +27,7 @@ __date__ = "$Date$"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"
 
-import logging, os, subprocess, time, signal
+import logging, os, subprocess, time, signal, tempfile

kwirk

diff --git a/fail2ban/client/jailreader.py b/fail2ban/client/jailreader.py
index 9943b69..776a164 100644
--- a/fail2ban/client/jailreader.py
+++ b/fail2ban/client/jailreader.py
@@ -94,12 +94,28 @@ class JailReader(ConfigReader):
 				logSys.error("Unable to read the filter")
 				return False
 			
+			actNames = set()
 			# Read action

kwirk

diff --git a/fail2ban/server/datedetector.py b/fail2ban/server/datedetector.py
index a29c975..734131d 100644
--- a/fail2ban/server/datedetector.py
+++ b/fail2ban/server/datedetector.py
@@ -29,7 +29,7 @@ __license__ = "GPL"
 
 import time, logging
 
-from datetemplate import DateStrptime, DateTai64n, DateEpoch, DateISO8601
+from datetemplate import DatePatternRegex, DateTai64n, DateEpoch, DateISO8601

kwirk

diff --git a/fail2ban/server/datetemplate.py b/fail2ban/server/datetemplate.py
index d37fa45..1be34d8 100644
--- a/fail2ban/server/datetemplate.py
+++ b/fail2ban/server/datetemplate.py
@@ -63,6 +63,9 @@ class DateTemplate:
 	def getHits(self):
 		return self.__hits
 	
+	def resetHits(self):
+		self.__hits = 0

kwirk

diff --git a/server/asyncserver.py b/server/asyncserver.py
index 62a5dd8..02fc766 100644
--- a/server/asyncserver.py
+++ b/server/asyncserver.py
@@ -75,6 +75,10 @@ class RequestHandler(asynchat.async_chat):
 		logSys.error(traceback.format_exc().splitlines())
 		self.close()
 		
+	def close(self):
+		self.socket.shutdown(socket.SHUT_RDWR)

kwirk

diff --git a/MANIFEST b/MANIFEST
index 8ad73b5..254c9b2 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -30,7 +30,6 @@ fail2ban/server/filterpoll.py
 fail2ban/server/iso8601.py
 fail2ban/server/server.py
 fail2ban/server/actions.py
-fail2ban/server/faildata.py
 fail2ban/server/failmanager.py

kwirk

diff --git a/fail2ban/server/action.py b/fail2ban/server/action.py
index 7e16901..c34c839 100644
--- a/fail2ban/server/action.py
+++ b/fail2ban/server/action.py
@@ -314,12 +314,15 @@ class Action:
 		"""
 		string = query
 		for tag, value in aInfo.iteritems():
-			value = str(value)			  # assure string
-			if tag == 'matches':