diff --git a/fail2ban/server/datedetector.py b/fail2ban/server/datedetector.py index b90e1b26..f89dc251 100644 --- a/fail2ban/server/datedetector.py +++ b/fail2ban/server/datedetector.py @@ -252,6 +252,8 @@ class DateDetector(object): "There is already a template with name %s" % name) self.__known_names.add(name) self.__templates.append(DateDetectorTemplate(template)) + logSys.debug(" date pattern regex for `%s`: `%s`", + getattr(template, 'pattern', ''), template.regex) def appendTemplate(self, template): """Add a date template to manage and use in search of dates. @@ -290,15 +292,14 @@ class DateDetector(object): DD_patternCache.set(key, template) self._appendTemplate(template) - logSys.info(" date pattern `%r`: `%s`", + logSys.info(" date pattern `%s`: `%s`", getattr(template, 'pattern', ''), template.name) - logSys.debug(" date pattern regex for %r: %s", - getattr(template, 'pattern', ''), template.regex) def addDefaultTemplate(self, filterTemplate=None, preMatch=None, allDefaults=True): """Add Fail2Ban's default set of date templates. """ ignoreDup = len(self.__templates) > 0 + cnt = 0 for template in ( DateDetector._defCache.templates if allDefaults else DateDetector._defCache.defaultTemplates ): @@ -311,6 +312,11 @@ class DateDetector(object): wrap=lambda s: RE_DATE_PREMATCH.sub(lambda m: DateTemplate.unboundPattern(s), preMatch)) # append date detector template (ignore duplicate if some was added before default): self._appendTemplate(template, ignoreDup=ignoreDup) + cnt += 1 + if preMatch: + logSys.info(" default date pattern for `%r`: %d template(s)", preMatch, cnt) + else: + logSys.info(" default %sdate pattern: %d template(s)", "filtered " if filterTemplate else "", cnt) @property def templates(self):