From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Tue, 10 Sep 2013 07:26:46 +0000 (+0200)
Subject: cluster: Avoid unnecessary SetForceNextCheck messages.
X-Git-Tag: v0.0.3~585
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=45219433bb57559c9ea25a6bfb037c67e2a5c871;p=icinga2

cluster: Avoid unnecessary SetForceNextCheck messages.
---

diff --git a/components/checker/checkercomponent.cpp b/components/checker/checkercomponent.cpp
index 633a5d478..6d9a14d8f 100644
--- a/components/checker/checkercomponent.cpp
+++ b/components/checker/checkercomponent.cpp
@@ -103,9 +103,10 @@ void CheckerComponent::CheckThreadProc(void)
 
 		m_IdleServices.erase(service);
 
+		bool forced = service->GetForceNextCheck();
 		bool check = true;
 
-		if (!service->GetForceNextCheck()) {
+		if (!forced) {
 			if (!service->GetEnableActiveChecks()) {
 				Log(LogDebug, "checker", "Skipping check for service '" + service->GetName() + "': active checks are disabled");
 				check = false;
@@ -136,7 +137,7 @@ void CheckerComponent::CheckThreadProc(void)
 
 		lock.unlock();
 
-		{
+		if (forced) {
 			ObjectLock olock(service);
 			service->SetForceNextCheck(false);
 		}