From 26685a93609fa238c7ea0bd974e2adcf2f8d3cc3 Mon Sep 17 00:00:00 2001
From: Mattia Codato <mattia.codato@wuerth-phoenix.com>
Date: Tue, 14 Jul 2020 11:57:12 +0200
Subject: [PATCH] Remove unuseful variable. Fix log

---
 lib/icinga/clusterevents-check.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/lib/icinga/clusterevents-check.cpp b/lib/icinga/clusterevents-check.cpp
index 85b52ebf4..0980a0c2c 100644
--- a/lib/icinga/clusterevents-check.cpp
+++ b/lib/icinga/clusterevents-check.cpp
@@ -93,16 +93,12 @@ void ClusterEvents::ExecuteCheckFromQueue(const MessageOrigin::Ptr& origin, cons
 	ApiListener::Ptr listener = ApiListener::GetInstance();
 
 	if (!listener) {
-		Log(LogCritical, "ApiListener", "No instance available.");
+		Log(LogCritical, "ApiListener") << "No instance available.";
 		return;
 	}
 
-	bool executeCommandProcessFinishedHandlerToBeReset = false;
-	Defer resetExecuteCommandProcessFinishedHandler ([&executeCommandProcessFinishedHandlerToBeReset]() {
-		if (executeCommandProcessFinishedHandlerToBeReset) {
-			Checkable::ExecuteCommandProcessFinishedHandler = nullptr;
-			executeCommandProcessFinishedHandlerToBeReset = false;
-		}
+	Defer resetExecuteCommandProcessFinishedHandler ([]() {
+		Checkable::ExecuteCommandProcessFinishedHandler = nullptr;
 	});
 
 	if (params->Contains("source")) {
@@ -184,7 +180,6 @@ void ClusterEvents::ExecuteCheckFromQueue(const MessageOrigin::Ptr& origin, cons
 				listener->SyncSendMessage(sourceEndpoint, executedMessage);
 			}
 		};
-		executeCommandProcessFinishedHandlerToBeReset = true;
 	}
 
 	if (!listener->GetAcceptCommands()) {