Bugfix: Unhandled exception in Service::CheckTimerHandler.

Fixes #3607

diff --git a/components/checker/checkercomponent.cpp b/components/checker/checkercomponent.cpp
index e3ab57e7bb2e1a2bc4fa45330d8bae8d02820ca0..be154436d01818e2d81d10fa243a3097f4a0f6d3 100644 (file)
--- a/components/checker/checkercomponent.cpp
+++ b/components/checker/checkercomponent.cpp
@@ -105,7 +105,11 @@ void CheckerComponent::CheckTimerHandler(void)
                m_IdleServices.erase(service);
                m_PendingServices.insert(service);
 
-               service->BeginExecuteCheck(boost::bind(&CheckerComponent::CheckCompletedHandler, this, service));
+               try {
+                       service->BeginExecuteCheck(boost::bind(&CheckerComponent::CheckCompletedHandler, this, service));
+               } catch (const exception& ex) {
+                       Logger::Write(LogCritical, "checker", "Exception occured while checking service '" + service->GetName() + "': " + ex.what());
+               }
 
                tasks++;
        }

diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp
index 265879c441be78ff0be72254ae66ca75dd436132..c1184f1f6009fb311c14c0edd53fc91cce731c84 100644 (file)
--- a/lib/icinga/service.cpp
+++ b/lib/icinga/service.cpp
@@ -682,13 +682,22 @@ void Service::BeginExecuteCheck(const function<void (void)>& callback)
        scheduleInfo->Set("schedule_start", GetNextCheck());
        scheduleInfo->Set("execution_start", Utility::GetTime());
 
-       vector<Value> arguments;
-       arguments.push_back(static_cast<Service::Ptr>(GetSelf()));
-       ScriptTask::Ptr task;
-       task = InvokeMethod("check", arguments, boost::bind(&Service::CheckCompletedHandler, this, scheduleInfo, _1, callback));
-       assert(task); /* TODO: gracefully handle missing methods */
+       try {
+               vector<Value> arguments;
+               arguments.push_back(static_cast<Service::Ptr>(GetSelf()));
+               ScriptTask::Ptr task;
+               task = InvokeMethod("check", arguments, boost::bind(&Service::CheckCompletedHandler, this, scheduleInfo, _1, callback));
+               Set("current_task", task);
+       } catch (...) {
+               /* something went wrong while setting up the method call -
+                * reschedule the service and call the callback anyway. */
+
+               UpdateNextCheck();
 
-       Set("current_task", task);
+               callback();
+
+               throw;
+       }
 }
 
 void Service::CheckCompletedHandler(const Dictionary::Ptr& scheduleInfo,