From e07df3f7d4eb87e16e040b6ec3c63619d0283f6a Mon Sep 17 00:00:00 2001
From: Steven Hiscocks <steven@hiscocks.me.uk>
Date: Sun, 22 Sep 2013 18:14:04 +0100
Subject: [PATCH] ENH: fail2ban-regex uses ISO8601 when using journal backend

Also fix setting of date pattern occurring too early, before filter
being created.
---
 bin/fail2ban-regex | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/bin/fail2ban-regex b/bin/fail2ban-regex
index b7d477c4..e54659f7 100755
--- a/bin/fail2ban-regex
+++ b/bin/fail2ban-regex
@@ -198,16 +198,9 @@ class Fail2banRegex(object):
 		self._print_all_missed = opts.print_all_missed
 		self._print_all_ignored = opts.print_all_ignored
 		self._maxlines_set = False		  # so we allow to override maxlines in cmdline
+		self._datepattern_set = False
 		self._journalmatch = None
 
-		if opts.datepattern:
-			self.setDatePattern(opts.datepattern)
-
-		if opts.encoding:
-			self.encoding = opts.encoding
-		else:
-			self.encoding = locale.getpreferredencoding()
-
 		self._filter = Filter(None)
 		self._ignoreregex = list()
 		self._failregex = list()
@@ -217,9 +210,20 @@ class Fail2banRegex(object):
 			self.setMaxLines(opts.maxlines)
 		if opts.journalmatch is not None:
 			self.setJournalMatch(opts.journalmatch.split())
+		if opts.datepattern:
+			self.setDatePattern(opts.datepattern)
+		if opts.encoding:
+			self.encoding = opts.encoding
+		else:
+			self.encoding = locale.getpreferredencoding()
+
+
 
 	def setDatePattern(self, pattern):
-		self._filter.setDatePattern(pattern)
+		if not self._datepattern_set:
+			self._filter.setDatePattern(pattern)
+			self._datepattern_set = True
+			print "Use      datepattern : %s" % self._filter.getDatePattern()[1]
 
 	def setMaxLines(self, v):
 		if not self._maxlines_set:
@@ -425,6 +429,11 @@ if __name__ == "__main__":
 	parser = get_opt_parser()
 	(opts, args) = parser.parse_args()
 
+	print
+	print "Running tests"
+	print "============="
+	print
+
 	fail2banRegex = Fail2banRegex(opts)
 
 	# We need 2 or 3 parameters
@@ -462,11 +471,6 @@ if __name__ == "__main__":
 		stdout.setFormatter(Formatter(fmt))
 	logSys.addHandler(stdout)
 
-	print
-	print "Running tests"
-	print "============="
-	print
-
 	cmd_log, cmd_regex = args[:2]
 
 	fail2banRegex.readRegex(cmd_regex, 'fail') or sys.exit(-1)
@@ -489,6 +493,7 @@ if __name__ == "__main__":
 			sys.exit(-1)
 		myjournal = journal.Reader(converters={'__CURSOR': lambda x: x})
 		journalmatch = fail2banRegex._journalmatch
+		fail2banRegex.setDatePattern("ISO8601")
 		if journalmatch:
 			try:
 				for element in journalmatch: