Fix event command execution not calling finish handler

fixes #6856

diff --git a/lib/base/threadpool.cpp b/lib/base/threadpool.cpp
index 365fe1fc9a02eb6fa7dc815b512bf501831e54bd..c7adb9cd41bd6dc7521ebeec20ca6b0057514632 100644 (file)
--- a/lib/base/threadpool.cpp
+++ b/lib/base/threadpool.cpp
@@ -130,7 +130,8 @@ void ThreadPool::WorkerThread::ThreadProc(Queue& queue)
 #endif /* _DEBUG */
 
                try {
-                       wi.Callback();
+                       if (wi.Callback)
+                               wi.Callback();
                } catch (const std::exception& ex) {
                        std::ostringstream msgbuf;
                        msgbuf << "Exception thrown in event handler: " << std::endl

diff --git a/lib/methods/plugineventtask.cpp b/lib/methods/plugineventtask.cpp
index 033616c1f1a0422f270b8cb8b83289af2c4961f6..f3f274c133ea510f4d2512a689ea28e84ac8cf2e 100644 (file)
--- a/lib/methods/plugineventtask.cpp
+++ b/lib/methods/plugineventtask.cpp
@@ -48,5 +48,16 @@ void PluginEventTask::ScriptFunc(const Checkable::Ptr& checkable)
        resolvers.push_back(std::make_pair("command", commandObj));
        resolvers.push_back(std::make_pair("icinga", IcingaApplication::GetInstance()));
 
-       PluginUtility::ExecuteCommand(commandObj, checkable, checkable->GetLastCheckResult(), resolvers);
+       PluginUtility::ExecuteCommand(commandObj, checkable, checkable->GetLastCheckResult(), resolvers, boost::bind(&PluginEventTask::ProcessFinishedHandler, checkable, _1, _2));
+}
+
+void PluginEventTask::ProcessFinishedHandler(const Checkable::Ptr& checkable, const Value& command, const ProcessResult& pr)
+{
+       if (pr.ExitStatus != 0) {
+               std::ostringstream msgbuf;
+               msgbuf << "Event command '" << command << "' for object '"
+                      << checkable->GetName() << "' failed; exit status: "
+                      << pr.ExitStatus << ", output: " << pr.Output;
+               Log(LogWarning, "PluginEventTask", msgbuf.str());
+       }
 }

diff --git a/lib/methods/plugineventtask.hpp b/lib/methods/plugineventtask.hpp
index ce57021b07e78ff8144e249c1a41e23629892a8f..5a71ee1cadf9f7aaa0db5b9b25a9c2f03ab3bff7 100644 (file)
--- a/lib/methods/plugineventtask.hpp
+++ b/lib/methods/plugineventtask.hpp
@@ -22,6 +22,7 @@
 
 #include "methods/i2-methods.hpp"
 #include "icinga/service.hpp"
+#include "base/process.hpp"
 
 namespace icinga
 {
@@ -38,6 +39,8 @@ public:
 
 private:
        PluginEventTask(void);
+
+        static void ProcessFinishedHandler(const Checkable::Ptr& checkable, const Value& command, const ProcessResult& pr);
 };
 
 }