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

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
This commit is contained in:
Alexander A. Klimov 2021-12-13 17:27:38 +01:00
parent 338d0aaa8c
commit eb71fb7529
2 changed files with 3 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

@ -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},

2
lib/notification/notificationcomponent.cpp
View File

@ -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"),