tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-27 07:34:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed incorrect lock in Notification::BeginExecuteNotificationHelper().

Browse Source
This commit is contained in:
Gunnar Beutner 2013-02-28 10:26:53 +01:00
parent cb907f4f3b
commit ee4c8a5755
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/icinga/notification.cpp
View File

@ -196,6 +196,14 @@ void Notification::BeginExecuteNotification(const Notification::Ptr& self, Notif
} }
BOOST_FOREACH(const User::Ptr& user, allUsers) { BOOST_FOREACH(const User::Ptr& user, allUsers) {
String user_name;
{
ObjectLock olock(user);
user_name = user->GetName();
}
Logger::Write(LogDebug, "icinga", "Sending notification for user " + user_name);
BeginExecuteNotificationHelper(self, macros, type, user); BeginExecuteNotificationHelper(self, macros, type, user);
} }
@ -211,7 +219,7 @@ void Notification::BeginExecuteNotificationHelper(const Notification::Ptr& self,
if (user) { if (user) {
{ {
ObjectLock olock(self); ObjectLock olock(user);
macroDicts.push_back(user->GetMacros()); macroDicts.push_back(user->GetMacros());
} }