BF: remove duplicate implemenation of reading datepatterns in fail2ban-regex

pull/590/head
Daniel Black 2014-01-18 23:52:20 +11:00
parent 10edd994d1
commit 97c7d391a4
1 changed files with 2 additions and 9 deletions

View File

@ -284,15 +284,8 @@ class Fail2banRegex(object):
datepattern = command[3] datepattern = command[3]
self.setDatePattern(datepattern) self.setDatePattern(datepattern)
else: else:
self.setJournalMatch(shlex.split(journalmatch)) print "ERROR: failed to read %s" % value
# Read out and set possible value for journalmatch return False
try:
datepattern = reader.get("Init", "datepattern")
except (NoSectionError, NoOptionError):
# No [Init].datepattern found.
pass
else:
self.setDatePattern(datepattern)
else: else:
print "Use %11s line : %s" % (regex, shortstr(value)) print "Use %11s line : %s" % (regex, shortstr(value))
regex_values = [RegexStat(value)] regex_values = [RegexStat(value)]