From eb71fb75297b1a1d490a2c66e9cfe8069d8013fa Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Mon, 13 Dec 2021 17:27:38 +0100 Subject: [PATCH 1/2] Avoid "type" key in dicts being part of object state attrs not to confuse the state file deserializator with e.g. `"type":32` on startup. That would unexpectedly restore null (not `{"type":32}`) as there's no type "32". refs #8186 --- lib/icinga/checkable-notification.cpp | 4 ++-- lib/notification/notificationcomponent.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/icinga/checkable-notification.cpp b/lib/icinga/checkable-notification.cpp index 8dc0dfd58..714df755c 100644 --- a/lib/icinga/checkable-notification.cpp +++ b/lib/icinga/checkable-notification.cpp @@ -74,7 +74,7 @@ void Checkable::SendNotifications(NotificationType type, const CheckResult::Ptr& << "Notification '" << notification->GetName() << "': there are some stashed notifications. Stashing notification to preserve order."; stashedNotifications->Add(new Dictionary({ - {"type", type}, + {"notification_type", type}, {"cr", cr}, {"force", force}, {"reminder", false}, @@ -99,7 +99,7 @@ void Checkable::SendNotifications(NotificationType type, const CheckResult::Ptr& << "Notification '" << notification->GetName() << "': object authority hasn't been updated, yet. Stashing notification."; notification->GetStashedNotifications()->Add(new Dictionary({ - {"type", type}, + {"notification_type", type}, {"cr", cr}, {"force", force}, {"reminder", false}, diff --git a/lib/notification/notificationcomponent.cpp b/lib/notification/notificationcomponent.cpp index 3bc4b5a63..7db9919aa 100644 --- a/lib/notification/notificationcomponent.cpp +++ b/lib/notification/notificationcomponent.cpp @@ -186,7 +186,7 @@ void NotificationComponent::NotificationTimerHandler() << "Attempting to send stashed notification '" << notificationName << "'."; notification->BeginExecuteNotification( - (NotificationType)(int)unstashedNotification->Get("type"), + (NotificationType)(int)unstashedNotification->Get("notification_type"), (CheckResult::Ptr)unstashedNotification->Get("cr"), (bool)unstashedNotification->Get("force"), (bool)unstashedNotification->Get("reminder"), From e9e555468df0886f1cbc8bb8f8e675d0d7706c3c Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Tue, 4 Jan 2022 17:17:20 +0100 Subject: [PATCH 2/2] Handle "type" key in dicts being part of object state attrs i.e. the confusion of the state file deserializator with e.g. `"type":32` on startup. That would unexpectedly restore (the now ignored) null (not `{"type":32}`) as there's no type "32". refs #8186 --- lib/notification/notificationcomponent.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/notification/notificationcomponent.cpp b/lib/notification/notificationcomponent.cpp index 7db9919aa..50bb2baf6 100644 --- a/lib/notification/notificationcomponent.cpp +++ b/lib/notification/notificationcomponent.cpp @@ -181,6 +181,9 @@ void NotificationComponent::NotificationTimerHandler() ObjectLock olock(unstashedNotifications); for (Dictionary::Ptr unstashedNotification : unstashedNotifications) { + if (!unstashedNotification) + continue; + try { Log(LogNotice, "NotificationComponent") << "Attempting to send stashed notification '" << notificationName << "'.";