ClusterCheckTask::ScriptFunc(): take CheckResultProducer::Ptr

This commit is contained in:
Alexander A. Klimov 2025-04-02 13:16:19 +02:00
parent c124f4beef
commit 34cf122c8e
2 changed files with 5 additions and 5 deletions

View File

@ -17,10 +17,10 @@
using namespace icinga; using namespace icinga;
REGISTER_FUNCTION_NONCONST(Internal, ClusterCheck, &ClusterCheckTask::ScriptFunc, "checkable:cr:resolvedMacros:useResolvedMacros"); REGISTER_FUNCTION_NONCONST(Internal, ClusterCheck, &ClusterCheckTask::ScriptFunc, "checkable:cr:producer:resolvedMacros:useResolvedMacros");
void ClusterCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, void ClusterCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr,
const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros) const CheckResultProducer::Ptr& producer, const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)
{ {
REQUIRE_NOT_NULL(checkable); REQUIRE_NOT_NULL(checkable);
REQUIRE_NOT_NULL(cr); REQUIRE_NOT_NULL(cr);
@ -47,7 +47,7 @@ void ClusterCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckRe
} else { } else {
cr->SetOutput(output); cr->SetOutput(output);
cr->SetState(ServiceUnknown); cr->SetState(ServiceUnknown);
checkable->ProcessCheckResult(cr); checkable->ProcessCheckResult(cr, producer);
} }
return; return;
@ -92,7 +92,7 @@ void ClusterCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckRe
cr->SetState(state); cr->SetState(state);
cr->SetOutput(output); cr->SetOutput(output);
checkable->ProcessCheckResult(cr); checkable->ProcessCheckResult(cr, producer);
} }
} }

View File

@ -17,7 +17,7 @@ class ClusterCheckTask
{ {
public: public:
static void ScriptFunc(const Checkable::Ptr& service, const CheckResult::Ptr& cr, static void ScriptFunc(const Checkable::Ptr& service, const CheckResult::Ptr& cr,
const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros); const CheckResultProducer::Ptr& producer, const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros);
private: private:
ClusterCheckTask(); ClusterCheckTask();