tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 14:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix ExecuteCommandProcessFinishedHandler parameters

Browse Source
This commit is contained in:
Mattia Codato 2020-07-13 16:54:37 +02:00
parent b9510e72dd
commit a3027d7177
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/icinga/checkable.cpp
View File

@ -20,7 +20,7 @@ boost::signals2::signal<void (const Checkable::Ptr&, const String&, double, cons
boost::signals2::signal<void (const Checkable::Ptr&, double)> Checkable::OnFlappingChange; boost::signals2::signal<void (const Checkable::Ptr&, double)> Checkable::OnFlappingChange;
static Timer::Ptr l_CheckablesFireSuppressedNotifications; static Timer::Ptr l_CheckablesFireSuppressedNotifications;
thread_local std::function<void(const Checkable::Ptr&, const CheckResult::Ptr&, const Value& /* commandLine */, const ProcessResult&)> Checkable::ExecuteCommandProcessFinishedHandler; thread_local std::function<void(const Value& commandLine, const ProcessResult&)> Checkable::ExecuteCommandProcessFinishedHandler;
void Checkable::StaticInitialize() void Checkable::StaticInitialize()
{ {

2
lib/icinga/checkable.hpp
View File

@ -57,7 +57,7 @@ public:
DECLARE_OBJECTNAME(Checkable); DECLARE_OBJECTNAME(Checkable);
static void StaticInitialize(); static void StaticInitialize();
static thread_local std::function<void(const Checkable::Ptr&, const CheckResult::Ptr&, const Value& /* commandLine */, const ProcessResult&)> ExecuteCommandProcessFinishedHandler; static thread_local std::function<void(const Value& commandLine, const ProcessResult&)> ExecuteCommandProcessFinishedHandler;
Checkable(); Checkable();

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

@ -135,7 +135,7 @@ void ClusterEvents::ExecuteCheckFromQueue(const MessageOrigin::Ptr& origin, cons
return; return;
} }
Checkable::ExecuteCommandProcessFinishedHandler = [listener, sourceEndpoint, origin, params] (const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, const Value& commandLine, const ProcessResult& pr) -> void { Checkable::ExecuteCommandProcessFinishedHandler = [checkable, listener, sourceEndpoint, origin, params] (const Value& commandLine, const ProcessResult& pr) {
Checkable::CurrentConcurrentChecks.fetch_sub(1); Checkable::CurrentConcurrentChecks.fetch_sub(1);
Checkable::DecreasePendingChecks(); Checkable::DecreasePendingChecks();
@ -150,6 +150,7 @@ void ClusterEvents::ExecuteCheckFromQueue(const MessageOrigin::Ptr& origin, cons
String output = pr.Output.Trim(); String output = pr.Output.Trim();
std::pair<String, String> co = PluginUtility::ParseCheckOutput(output); std::pair<String, String> co = PluginUtility::ParseCheckOutput(output);
CheckResult::Ptr cr = new CheckResult();
cr->SetCommand(commandLine); cr->SetCommand(commandLine);
cr->SetOutput(co.first); cr->SetOutput(co.first);
cr->SetPerformanceData(PluginUtility::SplitPerfdata(co.second)); cr->SetPerformanceData(PluginUtility::SplitPerfdata(co.second));
@ -174,10 +175,8 @@ void ClusterEvents::ExecuteCheckFromQueue(const MessageOrigin::Ptr& origin, cons
listener->SyncSendMessage(sourceEndpoint, executedMessage); listener->SyncSendMessage(sourceEndpoint, executedMessage);
} }
}; };
} else {
Checkable::ExecuteCommandProcessFinishedHandler = nullptr;
} }
if (!listener->GetAcceptCommands()) { if (!listener->GetAcceptCommands()) {
Log(LogWarning, "ApiListener") Log(LogWarning, "ApiListener")
<< "Ignoring command. '" << listener->GetName() << "' does not accept commands."; << "Ignoring command. '" << listener->GetName() << "' does not accept commands.";

11
lib/methods/pluginchecktask.cpp
View File

@ -44,15 +44,14 @@ void PluginCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckRes
timeout = checkable->GetCheckTimeout(); timeout = checkable->GetCheckTimeout();
std::function<void(const Value& commandLine, const ProcessResult&)> callback;
if (Checkable::ExecuteCommandProcessFinishedHandler) { if (Checkable::ExecuteCommandProcessFinishedHandler) {
PluginUtility::ExecuteCommand(commandObj, checkable, checkable->GetLastCheckResult(), callback = Checkable::ExecuteCommandProcessFinishedHandler;
resolvers, resolvedMacros, useResolvedMacros, timeout,
std::bind(Checkable::ExecuteCommandProcessFinishedHandler, checkable, cr, _1, _2));
} else { } else {
PluginUtility::ExecuteCommand(commandObj, checkable, checkable->GetLastCheckResult(), callback = std::bind(&PluginCheckTask::ProcessFinishedHandler, checkable, cr, _1, _2);
resolvers, resolvedMacros, useResolvedMacros, timeout,
std::bind(&PluginCheckTask::ProcessFinishedHandler, checkable, cr, _1, _2));
} }
PluginUtility::ExecuteCommand(commandObj, checkable, checkable->GetLastCheckResult(),
resolvers, resolvedMacros, useResolvedMacros, timeout, callback);
if (!resolvedMacros || useResolvedMacros) { if (!resolvedMacros || useResolvedMacros) {
Checkable::CurrentConcurrentChecks.fetch_add(1); Checkable::CurrentConcurrentChecks.fetch_add(1);