BF: fail2ban now don't print maxlines twice when using ignoreregex

Also read failregex first, as more natural place to get maxlines value
from.
pull/285/head
Steven Hiscocks 2013-07-05 18:47:08 +01:00
parent 6df949b29a
commit 3dbe2c04ca
1 changed files with 3 additions and 4 deletions

View File

@ -199,6 +199,7 @@ class Fail2banRegex(object):
if not self._maxlines_set:
self._filter.setMaxLines(int(v))
self._maxlines_set = True
print "Use maxlines : %d" % self._filter.getMaxLines()
def setJournalMatch(self, v):
if self._journalmatch is None:
@ -236,8 +237,6 @@ class Fail2banRegex(object):
else:
try:
self.setMaxLines(maxlines)
print "Use maxlines : %d" % (
self._filter.getMaxLines(), )
except ValueError:
print "ERROR: Invalid value for maxlines (%(maxlines)r) " \
"read from %(value)s" % locals()
@ -432,11 +431,11 @@ if __name__ == "__main__":
cmd_log, cmd_regex = args[:2]
fail2banRegex.readRegex(cmd_regex, 'fail') or sys.exit(-1)
if len(args) == 3:
fail2banRegex.readRegex(args[2], 'ignore') or sys.exit(-1)
fail2banRegex.readRegex(cmd_regex, 'fail') or sys.exit(-1)
if os.path.isfile(cmd_log):
try:
hdlr = open(cmd_log, 'rb')