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

CheckCommand#Execute(): take CheckResultProducer::Ptr

Browse Source
This commit is contained in:
Alexander A. Klimov 2025-04-02 14:36:33 +02:00
parent 8e6061f11e
commit bd4110db5e
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/icinga/apiactions.cpp
View File

@ -790,7 +790,7 @@ Dictionary::Ptr ApiActions::ExecuteCommand(const ConfigObject::Ptr& object, cons
Defer resetCheckCommandOverride([]() { Defer resetCheckCommandOverride([]() {
CheckCommand::ExecuteOverride = nullptr; CheckCommand::ExecuteOverride = nullptr;
}); });
cmd->Execute(checkable, cr, execMacros, false); cmd->Execute(checkable, cr, listener, execMacros, false);
} }
} else if (command_type == "EventCommand") { } else if (command_type == "EventCommand") {
EventCommand::Ptr cmd = GetSingleObjectByNameUsingPermissions(EventCommand::GetTypeName(), resolved_command, ActionsHandler::AuthenticatedApiUser); EventCommand::Ptr cmd = GetSingleObjectByNameUsingPermissions(EventCommand::GetTypeName(), resolved_command, ActionsHandler::AuthenticatedApiUser);

3
lib/icinga/checkcommand.cpp
View File

@ -11,11 +11,12 @@ REGISTER_TYPE(CheckCommand);
thread_local CheckCommand::Ptr CheckCommand::ExecuteOverride; thread_local CheckCommand::Ptr CheckCommand::ExecuteOverride;
void CheckCommand::Execute(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, void CheckCommand::Execute(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr,
const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros) const CheckResultProducer::Ptr& producer, const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)
{ {
GetExecute()->Invoke({ GetExecute()->Invoke({
checkable, checkable,
cr, cr,
producer,
resolvedMacros, resolvedMacros,
useResolvedMacros useResolvedMacros
}); });

1
lib/icinga/checkcommand.hpp
View File

@ -23,6 +23,7 @@ public:
static thread_local CheckCommand::Ptr ExecuteOverride; static thread_local CheckCommand::Ptr ExecuteOverride;
void Execute(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, void Execute(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr,
const CheckResultProducer::Ptr& producer,
const Dictionary::Ptr& resolvedMacros = nullptr, const Dictionary::Ptr& resolvedMacros = nullptr,
bool useResolvedMacros = false); bool useResolvedMacros = false);
}; };