tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-31 01:24:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove unuseful parameter from ExecuteRemoteCheck

Browse Source
This commit is contained in:
Mattia Codato 2020-07-13 10:14:30 +02:00
parent 6bad8bbc0f
commit 3414acbec1
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/icinga/checkable-check.cpp
View File

@ -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() + "'"); CONTEXT("Executing remote check for object '" + GetName() + "'");
@ -503,11 +503,7 @@ void Checkable::ExecuteRemoteCheck(const Dictionary::Ptr& resolvedMacros, const
cr->SetScheduleStart(scheduled_start); cr->SetScheduleStart(scheduled_start);
cr->SetExecutionStart(before_check); cr->SetExecutionStart(before_check);
if (!checkable) {
GetCheckCommand()->Execute(this, cr, resolvedMacros, true); GetCheckCommand()->Execute(this, cr, resolvedMacros, true);
} else {
GetCheckCommand()->Execute(checkable, cr, resolvedMacros, true);
}
} }
void Checkable::ExecuteCheck() void Checkable::ExecuteCheck()

2
lib/icinga/checkable.hpp
View File

@ -97,7 +97,7 @@ public:
static void UpdateStatistics(const CheckResult::Ptr& cr, CheckableType type); 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 ExecuteCheck();
void ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrigin::Ptr& origin = nullptr); void ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrigin::Ptr& origin = nullptr);

4
lib/icinga/clusterevents-check.cpp
View File

@ -97,7 +97,6 @@ void ClusterEvents::ExecuteCheckFromQueue(const MessageOrigin::Ptr& origin, cons
return; return;
} }
Checkable::Ptr checkable = nullptr;
if (params->Contains("source")) { if (params->Contains("source")) {
String uuid = params->Get("source"); String uuid = params->Get("source");
@ -107,6 +106,7 @@ void ClusterEvents::ExecuteCheckFromQueue(const MessageOrigin::Ptr& origin, cons
return; return;
} }
Checkable::Ptr checkable;
if (params->Contains("service")) if (params->Contains("service"))
checkable = host->GetServiceByShortName(params->Get("service")); checkable = host->GetServiceByShortName(params->Get("service"));
else else
@ -246,7 +246,7 @@ void ClusterEvents::ExecuteCheckFromQueue(const MessageOrigin::Ptr& origin, cons
if (command_type == "check_command") { if (command_type == "check_command") {
try { try {
host->ExecuteRemoteCheck(macros, checkable); host->ExecuteRemoteCheck(macros);
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
CheckResult::Ptr cr = new CheckResult(); CheckResult::Ptr cr = new CheckResult();
cr->SetState(ServiceUnknown); cr->SetState(ServiceUnknown);