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

MINOR: PEP-8 tweaks for multiline-matches change set

pull/476/head
Steven Hiscocks 2013-12-13 16:38:26 +00:00
parent 60d298d898
commit d9afcc178a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/fail2ban-regex
View File

@ -309,7 +309,7 @@ class Fail2banRegex(object):
def testIgnoreRegex(self, line): def testIgnoreRegex(self, line):
found = False found = False
try: try:
ret = self._filter.ignoreLine([(line,"","")]) ret = self._filter.ignoreLine([(line, "", "")])
if ret is not None: if ret is not None:
found = True found = True
regex = self._ignoreregex[ret].inc() regex = self._ignoreregex[ret].inc()

7
fail2ban/server/filter.py
View File

@ -366,9 +366,12 @@ class Filter(JailThread):
timeMatch = self.dateDetector.matchTime(l) timeMatch = self.dateDetector.matchTime(l)
if timeMatch: if timeMatch:
tupleLine = (l[:timeMatch.start()], l[timeMatch.start():timeMatch.end()] , l[timeMatch.end():]) tupleLine = (
l[:timeMatch.start()],
l[timeMatch.start():timeMatch.end()],
l[timeMatch.end():])
else: else:
tupleLine = (l,"","") tupleLine = (l, "", "")
return "".join(tupleLine[::2]), self.findFailure( return "".join(tupleLine[::2]), self.findFailure(
tupleLine, returnRawHost, checkAllRegex) tupleLine, returnRawHost, checkAllRegex)