small amend that correct log trace output by forget MLFID (outputs the reason why it was forgotten - close, disconnect, etc.)

pull/1728/head
sebres 2017-03-21 10:17:16 +01:00
parent b6886f2e51
commit 43d2cae8da
1 changed files with 4 additions and 4 deletions

View File

@ -690,8 +690,8 @@ class Filter(JailThread):
fail = self._mergeFailure(mlfid, fail, failRegex) fail = self._mergeFailure(mlfid, fail, failRegex)
# bypass if no-failure case: # bypass if no-failure case:
if fail.get('nofail'): if fail.get('nofail'):
logSys.log(7, "Nofail by mlfid %r in regex %s: waiting for failure", logSys.log(7, "Nofail by mlfid %r in regex %s: %s",
mlfid, failRegexIndex) mlfid, failRegexIndex, fail.get('mlfforget', "waiting for failure"))
if not self.checkAllRegex: return failList if not self.checkAllRegex: return failList
else: else:
# matched lines: # matched lines:
@ -719,8 +719,8 @@ class Filter(JailThread):
cidr = IPAddr.CIDR_RAW cidr = IPAddr.CIDR_RAW
# if mlfid case (not failure): # if mlfid case (not failure):
if host is None: if host is None:
logSys.log(7, "No failure-id by mlfid %r in regex %s: waiting for identifier", logSys.log(7, "No failure-id by mlfid %r in regex %s: %s",
mlfid, failRegexIndex) mlfid, failRegexIndex, fail.get('mlfforget', "waiting for identifier"))
if not self.checkAllRegex: return failList if not self.checkAllRegex: return failList
ips = [None] ips = [None]
# if raw - add single ip or failure-id, # if raw - add single ip or failure-id,