tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9123 from Icinga/bugfix/icinga2-crashes-when-sending-notifications-8186 

Avoid "type" key in dicts being part of object state attrs
This commit is contained in:
Julian Brost 2022-01-19 11:48:40 +01:00 committed by GitHub
parent 30e1e8d3f4 e9e555468d
commit 6390911262
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/icinga/checkable-notification.cpp
View File

@ -75,7 +75,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},
@ -100,7 +100,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},

5
lib/notification/notificationcomponent.cpp
View File

@ -183,12 +183,15 @@ void NotificationComponent::NotificationTimerHandler()
ObjectLock olock(unstashedNotifications);
for (Dictionary::Ptr unstashedNotification : unstashedNotifications) {
if (!unstashedNotification)
continue;
try {
Log(LogNotice, "NotificationComponent")
<< "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"),