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 #8591 from Icinga/bugfix/concurent-notification-send-and-delete 

Fix crash when notifications are sent while the notification object is deleted
This commit is contained in:
Alexander Aleksandrovič Klimov 2021-01-13 10:58:37 +01:00 committed by GitHub
parent 5f548c8f89 aea06a27dc
commit f1110eb321
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/icinga/notification.cpp
View File

@ -431,7 +431,11 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe
<< "Sending " << (reminder ? "reminder " : "") << "'" << NotificationTypeToString(type) << "' notification '" << "Sending " << (reminder ? "reminder " : "") << "'" << NotificationTypeToString(type) << "' notification '"
<< notificationName << "' for user '" << userName << "'"; << notificationName << "' for user '" << userName << "'";
Utility::QueueAsyncCallback(std::bind(&Notification::ExecuteNotificationHelper, this, type, user, cr, force, author, text)); // Explicitly use Notification::Ptr to keep the reference counted while the callback is active
Notification::Ptr notification (this);
Utility::QueueAsyncCallback([notification, type, user, cr, force, author, text]() {
notification->ExecuteNotificationHelper(type, user, cr, force, author, text);
});
/* collect all notified users */ /* collect all notified users */
allNotifiedUsers.insert(user); allNotifiedUsers.insert(user);