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

Fix deadlock in Service::BeginExecuteCheck().

This commit is contained in:
Gunnar Beutner 2013-02-26 10:58:59 +01:00
parent 45f8bfb730
commit 2189c1639c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/icinga/service-check.cpp
View File

@ -418,9 +418,10 @@ void Service::BeginExecuteCheck(const Service::Ptr& self, const function<void (v
{ {
ObjectLock olock(host); ObjectLock olock(host);
macroDicts.push_back(host->GetMacros()); macroDicts.push_back(host->GetMacros());
macroDicts.push_back(Host::CalculateDynamicMacros(host));
} }
macroDicts.push_back(Host::CalculateDynamicMacros(host));
IcingaApplication::Ptr app = IcingaApplication::GetInstance(); IcingaApplication::Ptr app = IcingaApplication::GetInstance();
{ {