tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor SendEventExecuteCommand function

This commit is contained in:
Mattia Codato 2020-07-23 11:31:44 +02:00
parent 6656afb259
commit 9940aaf90c
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,15 +75,15 @@ void ClusterEvents::EnqueueCheck(const MessageOrigin::Ptr& origin, const Diction
} }
} }
static void sendEventExecuteCommand(const Dictionary::Ptr& params, const long& exit, const String& output, static void SendEventExecuteCommand(const Dictionary::Ptr& params, long exitStatus, const String& output,
const double& start, const double& end, const ApiListener::Ptr& listener, const MessageOrigin::Ptr& origin, double start, double end, const ApiListener::Ptr& listener, const MessageOrigin::Ptr& origin,
const Endpoint::Ptr& sourceEndpoint) { const Endpoint::Ptr& sourceEndpoint) {
Dictionary::Ptr executedParams = new Dictionary(); Dictionary::Ptr executedParams = new Dictionary();
executedParams->Set("execution", params->Get("source")); executedParams->Set("execution", params->Get("source"));
executedParams->Set("host", params->Get("host")); executedParams->Set("host", params->Get("host"));
if (params->Contains("service")) if (params->Contains("service"))
executedParams->Set("service", params->Get("service")); executedParams->Set("service", params->Get("service"));
executedParams->Set("exit", exit); executedParams->Set("exit", exitStatus);
executedParams->Set("output", output); executedParams->Set("output", output);
executedParams->Set("start", start); executedParams->Set("start", start);
executedParams->Set("end", end); executedParams->Set("end", end);
@ -156,7 +156,8 @@ void ClusterEvents::ExecuteCheckFromQueue(const MessageOrigin::Ptr& origin, cons
<< pr.ExitStatus << ", output: " << pr.Output; << pr.ExitStatus << ", output: " << pr.Output;
} }
sendEventExecuteCommand(params, pr.ExitStatus, pr.Output, pr.ExecutionStart, pr.ExecutionEnd, listener, origin, sourceEndpoint); SendEventExecuteCommand(params, pr.ExitStatus, pr.Output, pr.ExecutionStart, pr.ExecutionEnd, listener,
origin, sourceEndpoint);
}; };
} }
@ -168,7 +169,7 @@ void ClusterEvents::ExecuteCheckFromQueue(const MessageOrigin::Ptr& origin, cons
if (params->Contains("source")) { if (params->Contains("source")) {
double now = Utility::GetTime(); double now = Utility::GetTime();
sendEventExecuteCommand(params, 126, output, now, now, listener, origin, sourceEndpoint); SendEventExecuteCommand(params, 126, output, now, now, listener, origin, sourceEndpoint);
} else { } else {
Host::Ptr host = new Host(); Host::Ptr host = new Host();
Dictionary::Ptr attrs = new Dictionary(); Dictionary::Ptr attrs = new Dictionary();
@ -223,7 +224,7 @@ void ClusterEvents::ExecuteCheckFromQueue(const MessageOrigin::Ptr& origin, cons
double now = Utility::GetTime(); double now = Utility::GetTime();
if (params->Contains("source")) { if (params->Contains("source")) {
sendEventExecuteCommand(params, state, output, now, now, listener, origin, sourceEndpoint); SendEventExecuteCommand(params, state, output, now, now, listener, origin, sourceEndpoint);
} else { } else {
CheckResult::Ptr cr = new CheckResult(); CheckResult::Ptr cr = new CheckResult();
cr->SetState(state); cr->SetState(state);
@ -241,7 +242,7 @@ void ClusterEvents::ExecuteCheckFromQueue(const MessageOrigin::Ptr& origin, cons
if (params->Contains("source")) { if (params->Contains("source")) {
double now = Utility::GetTime(); double now = Utility::GetTime();
ServiceState state = ServiceUnknown; ServiceState state = ServiceUnknown;
sendEventExecuteCommand(params, state, output, now, now, listener, origin, sourceEndpoint); SendEventExecuteCommand(params, state, output, now, now, listener, origin, sourceEndpoint);
} }
return; return;
} }
@ -253,7 +254,7 @@ void ClusterEvents::ExecuteCheckFromQueue(const MessageOrigin::Ptr& origin, cons
if (params->Contains("source")) { if (params->Contains("source")) {
double now = Utility::GetTime(); double now = Utility::GetTime();
ServiceState state = ServiceUnknown; ServiceState state = ServiceUnknown;
sendEventExecuteCommand(params, state, output, now, now, listener, origin, sourceEndpoint); SendEventExecuteCommand(params, state, output, now, now, listener, origin, sourceEndpoint);
} }
return; return;
} }
@ -277,7 +278,7 @@ void ClusterEvents::ExecuteCheckFromQueue(const MessageOrigin::Ptr& origin, cons
double now = Utility::GetTime(); double now = Utility::GetTime();
if (params->Contains("source")) { if (params->Contains("source")) {
sendEventExecuteCommand(params, state, output, now, now, listener, origin, sourceEndpoint); SendEventExecuteCommand(params, state, output, now, now, listener, origin, sourceEndpoint);
} else { } else {
CheckResult::Ptr cr = new CheckResult(); CheckResult::Ptr cr = new CheckResult();
cr->SetState(state); cr->SetState(state);
@ -329,7 +330,7 @@ void ClusterEvents::ExecuteCheckFromQueue(const MessageOrigin::Ptr& origin, cons
ServiceState state = ServiceUnknown; ServiceState state = ServiceUnknown;
if (params->Contains("source")) { if (params->Contains("source")) {
sendEventExecuteCommand(params, state, output, now, now, listener, origin, sourceEndpoint); SendEventExecuteCommand(params, state, output, now, now, listener, origin, sourceEndpoint);
} else { } else {
CheckResult::Ptr cr = new CheckResult(); CheckResult::Ptr cr = new CheckResult();
cr->SetState(state); cr->SetState(state);