[checkmk-commits] 5361 FIX Fixed cancelling events by "text" (regression #5057,

since 1.4.0p11) Message-ID: <59d48ab3.jrGWgD6ibsthLec+%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 703bb61ec6a0c1e5365425968e3c70081193cba5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=703bb61ec6a0c1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 4 09:07:57 2017 +0200 5361 FIX Fixed cancelling events by "text" (regression #5057, since 1.4.0p11) Change-Id: Ic9791980bdcf1fe5dc5d89b073f49faa330301f5 --- .werks/5361 | 11 +++++++++++ bin/mkeventd | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/5361 b/.werks/5361 new file mode 100644 index 0000000..f6546b0 --- /dev/null +++ b/.werks/5361 @@ -0,0 +1,11 @@ +Title: Fixed cancelling events by "text" (regression #5057, since 1.4.0p11) +Level: 1 +Component: ec +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1507100833 + + diff --git a/bin/mkeventd b/bin/mkeventd index a1e85a9..57f26ae 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -2448,7 +2448,7 @@ class EventServer(ECServerThread): cp = True match_groups = match(rule.get("match_ok", ""), event["text"], complete = False) - if match_groups != False and cp and cancel_by_application: + if match_groups != False and cp and ("cancel_application" not in rule or cancel_by_application): if debug: self.logger.info(" found cancelling event") if match_groups == True: