[checkmk-commits] 6418 FIX Fix a crash during notification cancelling

Module: check_mk Branch: master Commit: 593273e05988f93b913523b90cfe264c11297969 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=593273e05988f9… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Nov 21 12:05:21 2018 +0100 6418 FIX Fix a crash during notification cancelling When a notification was cancelled and the cancelling rule contained more contacts than the notification that was going to be cancelled the processing of notifications raised an exception. As a result no further notifications were processed. The exception was raised e.g. if a notification for the contact "ab" was cancelled for the users "ab" and "cd" using the option "The following users" in the contact selection. With this werk the issue is fixed. Change-Id: I725452b02e5db22977707044d0474a4ab4340725 --- .werks/6418 | 20 ++++++++++++++++++++ cmk_base/notify.py | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/6418 b/.werks/6418 new file mode 100644 index 0000000..9d6924b --- /dev/null +++ b/.werks/6418 @@ -0,0 +1,20 @@ +Title: Fix a crash during notification cancelling +Level: 1 +Component: notifications +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1542797388 + +When a notification was cancelled and the cancelling rule contained +more contacts than the notification that was going to be cancelled +the processing of notifications raised an exception. As a result +no further notifications were processed. + +The exception was raised e.g. if a notification for the contact "ab" +was cancelled for the users "ab" and "cd" using the option "The +following users" in the contact selection. + +With this werk the issue is fixed. diff --git a/cmk_base/notify.py b/cmk_base/notify.py index 68c8876..4be8c47 100755 --- a/cmk_base/notify.py +++ b/cmk_base/notify.py @@ -474,7 +474,7 @@ def notify_rulebased(raw_context, analyse=False): remaining = notify_contacts.difference(contacts) if not remaining: - del notifications[key] + del notifications[notify_key] else: new_key = remaining, plugin notifications[new_key] = notifications.pop(notify_key)