From 3414acbec184770f609bb3c77f6a5bfecf214413 Mon Sep 17 00:00:00 2001
From: Mattia Codato <mattia.codato@wuerth-phoenix.com>
Date: Mon, 13 Jul 2020 10:14:30 +0200
Subject: [PATCH] Remove unuseful parameter from ExecuteRemoteCheck

---
 lib/icinga/checkable-check.cpp     | 8 ++------
 lib/icinga/checkable.hpp           | 2 +-
 lib/icinga/clusterevents-check.cpp | 4 ++--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp
index cc32f09ee..68361fe17 100644
--- a/lib/icinga/checkable-check.cpp
+++ b/lib/icinga/checkable-check.cpp
@@ -492,7 +492,7 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
 	}
 }
 
-void Checkable::ExecuteRemoteCheck(const Dictionary::Ptr& resolvedMacros, const Checkable::Ptr& checkable)
+void Checkable::ExecuteRemoteCheck(const Dictionary::Ptr& resolvedMacros)
 {
 	CONTEXT("Executing remote check for object '" + GetName() + "'");
 
@@ -503,11 +503,7 @@ void Checkable::ExecuteRemoteCheck(const Dictionary::Ptr& resolvedMacros, const
 	cr->SetScheduleStart(scheduled_start);
 	cr->SetExecutionStart(before_check);
 
-	if (!checkable) {
-		GetCheckCommand()->Execute(this, cr, resolvedMacros, true);
-	} else {
-		GetCheckCommand()->Execute(checkable, cr, resolvedMacros, true);
-	}
+	GetCheckCommand()->Execute(this, cr, resolvedMacros, true);
 }
 
 void Checkable::ExecuteCheck()
diff --git a/lib/icinga/checkable.hpp b/lib/icinga/checkable.hpp
index 38ecf0106..dd74b85db 100644
--- a/lib/icinga/checkable.hpp
+++ b/lib/icinga/checkable.hpp
@@ -97,7 +97,7 @@ public:
 
 	static void UpdateStatistics(const CheckResult::Ptr& cr, CheckableType type);
 
-	void ExecuteRemoteCheck(const Dictionary::Ptr& resolvedMacros = nullptr, const Checkable::Ptr& checkbale = nullptr);
+	void ExecuteRemoteCheck(const Dictionary::Ptr& resolvedMacros = nullptr);
 	void ExecuteCheck();
 	void ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrigin::Ptr& origin = nullptr);
 
diff --git a/lib/icinga/clusterevents-check.cpp b/lib/icinga/clusterevents-check.cpp
index 7d86a17ec..ffa0b6a3a 100644
--- a/lib/icinga/clusterevents-check.cpp
+++ b/lib/icinga/clusterevents-check.cpp
@@ -97,7 +97,6 @@ void ClusterEvents::ExecuteCheckFromQueue(const MessageOrigin::Ptr& origin, cons
 		return;
 	}
 
-	Checkable::Ptr checkable = nullptr;
 	if (params->Contains("source")) {
 		String uuid = params->Get("source");
 
@@ -107,6 +106,7 @@ void ClusterEvents::ExecuteCheckFromQueue(const MessageOrigin::Ptr& origin, cons
 			return;
 		}
 
+		Checkable::Ptr checkable;
 		if (params->Contains("service"))
 			checkable = host->GetServiceByShortName(params->Get("service"));
 		else
@@ -246,7 +246,7 @@ void ClusterEvents::ExecuteCheckFromQueue(const MessageOrigin::Ptr& origin, cons
 
 	if (command_type == "check_command") {
 		try {
-			host->ExecuteRemoteCheck(macros, checkable);
+			host->ExecuteRemoteCheck(macros);
 		} catch (const std::exception& ex) {
 			CheckResult::Ptr cr = new CheckResult();
 			cr->SetState(ServiceUnknown);