github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity

changed from DateASSPlike class to DateStrptime

pull/193/merge
Enrico Labedzki 2013-05-01 02:25:05 +02:00 committed by Yaroslav Halchenko
parent ba8f012637
commit 9185c070eb
2 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/datedetector.py
View File

@ -29,7 +29,7 @@ __license__ = "GPL"
import time, logging
from datetemplate import DateStrptime, DateTai64n, DateEpoch, DateISO8601, DateASSPlike
from datetemplate import DateStrptime, DateTai64n, DateEpoch, DateISO8601
from threading import Lock
# Gets the instance of the logger.
@ -162,8 +162,8 @@ class DateDetector:
template.setPattern("%y%m%d %H:%M:%S")
self._appendTemplate(template)
# ASSP: Apr-27-13 02:33:06
template = DateASSPlike()
template.setName("ASSP like date format")
template = DateStrptime()
template.setName("Month-Day-Year Hour:Minute:Second")
template.setRegex("^[a-zA-Z]{3}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}")
template.setPattern("%b-%d-%y %H:%M:%S")
self._appendTemplate(template)

19
server/datetemplate.py
View File

@ -220,22 +220,3 @@ class DateISO8601(DateTemplate):
return date
class DateASSPlike(DateTemplate):
def __init__(self):
DateTemplate.__init__(self)
self.__pattern = ""
def setPattern(self, pattern):
self.__pattern = pattern.strip()
def getPattern(self):
return self.__pattern
def getDate(self, line):
date = None
dateMatch = self.matchDate(line)
if dateMatch:
date = list(time.strptime(dateMatch.group(), self.getPattern()))
return date