diff --git a/server/datedetector.py b/server/datedetector.py index f0ba2635..c013d551 100644 --- a/server/datedetector.py +++ b/server/datedetector.py @@ -40,6 +40,14 @@ class DateDetector: def __init__(self): self.__lock = Lock() self.__templates = list() + self.__known_names = set() + + def _appendTemplate(self, template): + name = template.getName() + if name in self.__known_names: + raise ValueError("There is already a template with name %s" % name) + self.__known_names.add(name) + self.__templates.append(template) def addDefaultTemplate(self): self.__lock.acquire() @@ -49,104 +57,104 @@ class DateDetector: template.setName("MONTH Day Hour:Minute:Second") template.setRegex("\S{3}\s{1,2}\d{1,2} \d{2}:\d{2}:\d{2}") template.setPattern("%b %d %H:%M:%S") - self.__templates.append(template) + self._appendTemplate(template) # asctime 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}") template.setPattern("%a %b %d %H:%M:%S %Y") - self.__templates.append(template) + self._appendTemplate(template) # asctime without year template = DateStrptime() template.setName("WEEKDAY MONTH Day Hour:Minute:Second") template.setRegex("\S{3} \S{3}\s{1,2}\d{1,2} \d{2}:\d{2}:\d{2}") template.setPattern("%a %b %d %H:%M:%S") - self.__templates.append(template) + self._appendTemplate(template) # simple date template = DateStrptime() template.setName("Year/Month/Day Hour:Minute:Second") template.setRegex("\d{4}/\d{2}/\d{2} \d{2}:\d{2}:\d{2}") template.setPattern("%Y/%m/%d %H:%M:%S") - self.__templates.append(template) + self._appendTemplate(template) # simple date too (from x11vnc) template = DateStrptime() template.setName("Day/Month/Year Hour:Minute:Second") template.setRegex("\d{2}/\d{2}/\d{4} \d{2}:\d{2}:\d{2}") template.setPattern("%d/%m/%Y %H:%M:%S") - self.__templates.append(template) + self._appendTemplate(template) # previous one but with year given by 2 digits # (See http://bugs.debian.org/537610) template = DateStrptime() template.setName("Day/Month/Year2 Hour:Minute:Second") template.setRegex("\d{2}/\d{2}/\d{2} \d{2}:\d{2}:\d{2}") template.setPattern("%d/%m/%y %H:%M:%S") - self.__templates.append(template) + self._appendTemplate(template) # Apache format [31/Oct/2006:09:22:55 -0000] template = DateStrptime() template.setName("Day/MONTH/Year:Hour:Minute:Second") template.setRegex("\d{2}/\S{3}/\d{4}:\d{2}:\d{2}:\d{2}") template.setPattern("%d/%b/%Y:%H:%M:%S") - self.__templates.append(template) + self._appendTemplate(template) # CPanel 05/20/2008:01:57:39 template = DateStrptime() template.setName("Month/Day/Year:Hour:Minute:Second") template.setRegex("\d{2}/\d{2}/\d{4}:\d{2}:\d{2}:\d{2}") template.setPattern("%m/%d/%Y:%H:%M:%S") - self.__templates.append(template) + self._appendTemplate(template) # Exim 2006-12-21 06:43:20 template = DateStrptime() template.setName("Year-Month-Day Hour:Minute:Second") template.setRegex("\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}") template.setPattern("%Y-%m-%d %H:%M:%S") - self.__templates.append(template) + self._appendTemplate(template) # custom for syslog-ng 2006.12.21 06:43:20 template = DateStrptime() template.setName("Year.Month.Day Hour:Minute:Second") template.setRegex("\d{4}.\d{2}.\d{2} \d{2}:\d{2}:\d{2}") template.setPattern("%Y.%m.%d %H:%M:%S") - self.__templates.append(template) + self._appendTemplate(template) # named 26-Jul-2007 15:20:52.252 template = DateStrptime() template.setName("Day-MONTH-Year Hour:Minute:Second[.Millisecond]") template.setRegex("\d{2}-\S{3}-\d{4} \d{2}:\d{2}:\d{2}") template.setPattern("%d-%b-%Y %H:%M:%S") - self.__templates.append(template) + self._appendTemplate(template) # 17-07-2008 17:23:25 template = DateStrptime() template.setName("Day-Month-Year Hour:Minute:Second") template.setRegex("\d{2}-\d{2}-\d{4} \d{2}:\d{2}:\d{2}") template.setPattern("%d-%m-%Y %H:%M:%S") - self.__templates.append(template) + self._appendTemplate(template) # 01-27-2012 16:22:44.252 template = DateStrptime() template.setName("Month-Day-Year Hour:Minute:Second[.Millisecond]") template.setRegex("\d{2}-\d{2}-\d{4} \d{2}:\d{2}:\d{2}") template.setPattern("%m-%d-%Y %H:%M:%S") - self.__templates.append(template) + self._appendTemplate(template) # TAI64N template = DateTai64n() template.setName("TAI64N") - self.__templates.append(template) + self._appendTemplate(template) # Epoch template = DateEpoch() template.setName("Epoch") - self.__templates.append(template) + self._appendTemplate(template) # ISO 8601 template = DateISO8601() template.setName("ISO 8601") - self.__templates.append(template) + self._appendTemplate(template) # Only time information in the log template = DateStrptime() template.setName("Hour:Minute:Second") template.setRegex("^\d{2}:\d{2}:\d{2}") template.setPattern("%H:%M:%S") - self.__templates.append(template) + self._appendTemplate(template) # <09/16/08@05:03:30> template = DateStrptime() template.setName("") template.setRegex("^<\d{2}/\d{2}/\d{2}@\d{2}:\d{2}:\d{2}>") template.setPattern("<%m/%d/%y@%H:%M:%S>") - self.__templates.append(template) + self._appendTemplate(template) finally: self.__lock.release() diff --git a/testcases/datedetectortestcase.py b/testcases/datedetectortestcase.py index d6946144..34ce22ce 100644 --- a/testcases/datedetectortestcase.py +++ b/testcases/datedetectortestcase.py @@ -85,7 +85,10 @@ class DateDetectorTest(unittest.TestCase): for old_name, n in zip(old_names, self.__datedetector.getTemplates()): self.assertEqual(old_name, n.getName()) # "Sort must be stable" - + def testAllUniqueTemplateNames(self): + self.assertRaises(ValueError, self.__datedetector._appendTemplate, + self.__datedetector.getTemplates()[0]) + # def testDefaultTempate(self): # self.__datedetector.setDefaultRegex("^\S{3}\s{1,2}\d{1,2} \d{2}:\d{2}:\d{2}") # self.__datedetector.setDefaultPattern("%b %d %H:%M:%S")