[icinga-checkins] icinga.org: icinga2/master: Fix deadlock in Service::BeginExecuteCheck().

git at icinga.org git at icinga.org
Tue Feb 26 10:59:07 CET 2013


Module: icinga2
Branch: master
Commit: 2189c1639cac46a17322da8bdf8de6e90a515989
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=2189c1639cac46a17322da8bdf8de6e90a515989

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Tue Feb 26 10:58:59 2013 +0100

Fix deadlock in Service::BeginExecuteCheck().

---

 lib/icinga/service-check.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/lib/icinga/service-check.cpp b/lib/icinga/service-check.cpp
index 175d179..78895cf 100644
--- a/lib/icinga/service-check.cpp
+++ b/lib/icinga/service-check.cpp
@@ -418,9 +418,10 @@ void Service::BeginExecuteCheck(const Service::Ptr& self, const function<void (v
 	{
 		ObjectLock olock(host);
 		macroDicts.push_back(host->GetMacros());
-		macroDicts.push_back(Host::CalculateDynamicMacros(host));
 	}
 
+	macroDicts.push_back(Host::CalculateDynamicMacros(host));
+
 	IcingaApplication::Ptr app = IcingaApplication::GetInstance();
 
 	{





More information about the icinga-checkins mailing list