From ced271b908d13f35951a7997bb0b5645eb21191e Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Sun, 25 Aug 2013 21:11:47 +1000 Subject: [PATCH] ENH: date for apache-2.4 - adds milliseconds --- ChangeLog | 1 + server/datedetector.py | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f06e46a9..d088833c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ ver. 0.8.11 (2013/XX/XXX) - loves-unittests Daniel Black * filter.d/exim-spam.conf -- a splitout of exim's spam regexes with additions for greater control over filtering spam. + * add date expression for apache-2.4 - milliseconds - Enhancements: Daniel Black * filter.d/{asterisk,assp,dovecot,proftpd}.conf -- regex hardening diff --git a/server/datedetector.py b/server/datedetector.py index 0f0feb6d..83d69733 100644 --- a/server/datedetector.py +++ b/server/datedetector.py @@ -46,7 +46,13 @@ class DateDetector: def addDefaultTemplate(self): self.__lock.acquire() try: - # asctime + # asctime with subsecond + template = DateStrptime() + template.setName("WEEKDAY MONTH Day Hour:Minute:Second[.subsecond] Year") + template.setRegex("\S{3} \S{3}\s{1,2}\d{1,2} \d{2}:\d{2}:\d{2}\.\d+ \d{4}") + template.setPattern("%a %b %d %H:%M:%S.%f %Y") + self._appendTemplate(template) + # asctime without no subsecond template = DateStrptime() template.setName("WEEKDAY MONTH Day Hour:Minute:Second Year") template.setRegex("\S{3} \S{3}\s{1,2}\d{1,2} \d{2}:\d{2}:\d{2} \d{4}")