From 43d2cae8dae53eb51d3841450de6b0a03a2e1218 Mon Sep 17 00:00:00 2001 From: sebres Date: Tue, 21 Mar 2017 10:17:16 +0100 Subject: [PATCH] small amend that correct log trace output by forget MLFID (outputs the reason why it was forgotten - close, disconnect, etc.) --- fail2ban/server/filter.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fail2ban/server/filter.py b/fail2ban/server/filter.py index 76787cc7..72bf47d8 100644 --- a/fail2ban/server/filter.py +++ b/fail2ban/server/filter.py @@ -690,8 +690,8 @@ class Filter(JailThread): fail = self._mergeFailure(mlfid, fail, failRegex) # bypass if no-failure case: if fail.get('nofail'): - logSys.log(7, "Nofail by mlfid %r in regex %s: waiting for failure", - mlfid, failRegexIndex) + logSys.log(7, "Nofail by mlfid %r in regex %s: %s", + mlfid, failRegexIndex, fail.get('mlfforget', "waiting for failure")) if not self.checkAllRegex: return failList else: # matched lines: @@ -719,8 +719,8 @@ class Filter(JailThread): cidr = IPAddr.CIDR_RAW # if mlfid case (not failure): if host is None: - logSys.log(7, "No failure-id by mlfid %r in regex %s: waiting for identifier", - mlfid, failRegexIndex) + logSys.log(7, "No failure-id by mlfid %r in regex %s: %s", + mlfid, failRegexIndex, fail.get('mlfforget', "waiting for identifier")) if not self.checkAllRegex: return failList ips = [None] # if raw - add single ip or failure-id,