mirrors/fail2ban
1
0
Fork 0
mirror of https://github.com/fail2ban/fail2ban.git synced 2025-11-26 14:20:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into kwirk-merge

Browse Source 
Conflicts:
	ChangeLog
	testcases/files/logs/dropbear
This commit is contained in:
Daniel Black
2013-08-25 21:21:14 +10:00
parent fd7cc5bda7 2aa8ddea4d
commit b589533d69
25 changed files with 173 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/datedetector.py
View File

@@ -157,7 +157,7 @@ class DateDetector:
self._appendTemplate(template)
# MySQL: 130322 11:46:11
template = DateStrptime()
template.setName("MonthDayYear Hour:Minute:Second")
template.setName("YearMonthDay Hour:Minute:Second")
template.setRegex("^\d{2}\d{2}\d{2} +\d{1,2}:\d{2}:\d{2}")
template.setPattern("%y%m%d %H:%M:%S")
self._appendTemplate(template)