From: Noah Hilverling <noah@hilverling.com>
Date: Tue, 29 May 2018 11:51:34 +0000 (+0200)
Subject: Fix that checks with command_endpoint don't return any check results
X-Git-Tag: v2.9.0~39^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=refs%2Fpull%2F6343%2Fhead;p=icinga2

Fix that checks with command_endpoint don't return any check results

fixes #6337
---

diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp
index 76b2cc37e..719611aba 100644
--- a/lib/icinga/checkable-check.cpp
+++ b/lib/icinga/checkable-check.cpp
@@ -107,7 +107,7 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
 		m_CheckRunning = false;
 	}
 
-	if (!cr || !IsActive())
+	if (!cr)
 		return;
 
 	double now = Utility::GetTime();
@@ -147,6 +147,9 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
 
 	}
 
+	if (!IsActive())
+		return;
+
 	bool reachable = IsReachable();
 	bool notification_reachable = IsReachable(DependencyNotification);