Fix RandomCheckTask result processing.

Fixes #5780

diff --git a/lib/methods/randomchecktask.cpp b/lib/methods/randomchecktask.cpp
index 8aa90dee326fdf19244a02847390a110d9e3a43e..ebbd321d8d4b2019e11e9888358922d2f84275eb 100644 (file)
--- a/lib/methods/randomchecktask.cpp
+++ b/lib/methods/randomchecktask.cpp
@@ -31,7 +31,7 @@ using namespace icinga;
 
 REGISTER_SCRIPTFUNCTION(RandomCheck, &RandomCheckTask::ScriptFunc);
 
-CheckResult::Ptr RandomCheckTask::ScriptFunc(const Service::Ptr&)
+void RandomCheckTask::ScriptFunc(const Service::Ptr& service, const CheckResult::Ptr& cr)
 {
        String output = "Hello from ";
        output += Utility::GetHostName();
@@ -39,12 +39,11 @@ CheckResult::Ptr RandomCheckTask::ScriptFunc(const Service::Ptr&)
        Dictionary::Ptr perfdata = make_shared<Dictionary>();
        perfdata->Set("time", Convert::ToDouble(Utility::GetTime()));
 
-       CheckResult::Ptr cr = make_shared<CheckResult>();
        cr->SetOutput(output);
        cr->SetPerformanceData(perfdata);
        cr->SetState(static_cast<ServiceState>(Utility::Random() % 4));
        cr->SetCheckSource(IcingaApplication::GetInstance()->GetNodeName());
 
-       return cr;
+       service->ProcessCheckResult(cr);
 }
 

diff --git a/lib/methods/randomchecktask.h b/lib/methods/randomchecktask.h
index bf64676ff559817826eca0f84a3b4ba7c2416554..dfea164c50b9d2ef7454252e8fba9c24b8ccde03 100644 (file)
--- a/lib/methods/randomchecktask.h
+++ b/lib/methods/randomchecktask.h
@@ -34,7 +34,7 @@ namespace icinga
 class RandomCheckTask
 {
 public:
-       static CheckResult::Ptr ScriptFunc(const Service::Ptr& service);
+       static void ScriptFunc(const Service::Ptr& service, const CheckResult::Ptr& cr);
 
 private:
        RandomCheckTask(void);