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

Fix another deadlock.

This commit is contained in:
Gunnar Beutner 2013-03-08 16:36:26 +01:00
parent 4371649064
commit cf4397873c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/icinga/service.cpp
View File

@ -311,11 +311,13 @@ void Service::SetAcknowledgementExpiry(double timestamp)
* @threadsafety Always. * @threadsafety Always.
*/ */
void Service::AcknowledgeProblem(AcknowledgementType type, double expiry) void Service::AcknowledgeProblem(AcknowledgementType type, double expiry)
{
{ {
ObjectLock olock(this); ObjectLock olock(this);
SetAcknowledgement(type); SetAcknowledgement(type);
SetAcknowledgementExpiry(expiry); SetAcknowledgementExpiry(expiry);
}
RequestNotifications(NotificationAcknowledgement, GetLastCheckResult()); RequestNotifications(NotificationAcknowledgement, GetLastCheckResult());
} }