diff --git a/lib/checker/checkercomponent.cpp b/lib/checker/checkercomponent.cpp index 66abdd944..525d15705 100644 --- a/lib/checker/checkercomponent.cpp +++ b/lib/checker/checkercomponent.cpp @@ -138,7 +138,6 @@ void CheckerComponent::CheckThreadProc() bool forced = checkable->GetForceNextCheck(); bool check = true; - bool notifyNextCheck = false; double nextCheck = -1; if (!forced) { @@ -147,7 +146,6 @@ void CheckerComponent::CheckThreadProc() << "Skipping check for object '" << checkable->GetName() << "': Dependency failed."; check = false; - notifyNextCheck = true; } Host::Ptr host; @@ -184,7 +182,6 @@ void CheckerComponent::CheckThreadProc() << Utility::FormatDateTime("%Y-%m-%d %H:%M:%S %z", nextCheck); check = false; - notifyNextCheck = true; } } } @@ -203,11 +200,6 @@ void CheckerComponent::CheckThreadProc() checkable->UpdateNextCheck(); } - if (notifyNextCheck) { - // Trigger update event for Icinga DB - Checkable::OnNextCheckUpdated(checkable); - } - lock.lock(); continue; diff --git a/lib/icinga/apiactions.cpp b/lib/icinga/apiactions.cpp index e7c2e3510..3586bf2ec 100644 --- a/lib/icinga/apiactions.cpp +++ b/lib/icinga/apiactions.cpp @@ -159,9 +159,6 @@ Dictionary::Ptr ApiActions::RescheduleCheck(const ConfigObject::Ptr& object, checkable->SetNextCheck(nextCheck); - /* trigger update event for DB IDO */ - Checkable::OnNextCheckUpdated(checkable); - return ApiActions::CreateResult(200, "Successfully rescheduled check for object '" + checkable->GetName() + "'."); } diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp index 7d1fd29f5..963dde38d 100644 --- a/lib/icinga/checkable-check.cpp +++ b/lib/icinga/checkable-check.cpp @@ -22,7 +22,6 @@ boost::signals2::signal Checkable::OnStateChange; boost::signals2::signal, const MessageOrigin::Ptr&)> Checkable::OnReachabilityChanged; boost::signals2::signal Checkable::OnNotificationsRequested; -boost::signals2::signal Checkable::OnNextCheckUpdated; boost::signals2::signal Checkable::OnRescheduleCheck; Atomic Checkable::CurrentConcurrentChecks (0); diff --git a/lib/icinga/checkable.hpp b/lib/icinga/checkable.hpp index 3ee412504..b4ae94f1e 100644 --- a/lib/icinga/checkable.hpp +++ b/lib/icinga/checkable.hpp @@ -147,7 +147,6 @@ public: bool, bool, double, double, const MessageOrigin::Ptr&)> OnAcknowledgementSet; static boost::signals2::signal OnAcknowledgementCleared; static boost::signals2::signal OnFlappingChange; - static boost::signals2::signal OnNextCheckUpdated; /** * Think again! Are you really sure you want to subscribe to this signal? * diff --git a/lib/icinga/externalcommandprocessor.cpp b/lib/icinga/externalcommandprocessor.cpp index 33831a491..b61f640fd 100644 --- a/lib/icinga/externalcommandprocessor.cpp +++ b/lib/icinga/externalcommandprocessor.cpp @@ -392,9 +392,6 @@ void ExternalCommandProcessor::ScheduleHostCheck(double, const std::vectorSetNextCheck(planned_check); - - /* trigger update event for DB IDO */ - Checkable::OnNextCheckUpdated(host); } void ExternalCommandProcessor::ScheduleForcedHostCheck(double, const std::vector& arguments) @@ -409,9 +406,6 @@ void ExternalCommandProcessor::ScheduleForcedHostCheck(double, const std::vector host->SetForceNextCheck(true); host->SetNextCheck(Convert::ToDouble(arguments[1])); - - /* trigger update event for DB IDO */ - Checkable::OnNextCheckUpdated(host); } void ExternalCommandProcessor::ScheduleSvcCheck(double, const std::vector& arguments) @@ -437,9 +431,6 @@ void ExternalCommandProcessor::ScheduleSvcCheck(double, const std::vectorSetNextCheck(planned_check); - - /* trigger update event for DB IDO */ - Checkable::OnNextCheckUpdated(service); } void ExternalCommandProcessor::ScheduleForcedSvcCheck(double, const std::vector& arguments) @@ -454,9 +445,6 @@ void ExternalCommandProcessor::ScheduleForcedSvcCheck(double, const std::vector< service->SetForceNextCheck(true); service->SetNextCheck(Convert::ToDouble(arguments[2])); - - /* trigger update event for DB IDO */ - Checkable::OnNextCheckUpdated(service); } void ExternalCommandProcessor::EnableHostCheck(double, const std::vector& arguments) @@ -538,9 +526,6 @@ void ExternalCommandProcessor::ScheduleForcedHostSvcChecks(double, const std::ve service->SetNextCheck(planned_check); service->SetForceNextCheck(true); - - /* trigger update event for DB IDO */ - Checkable::OnNextCheckUpdated(service); } } @@ -568,9 +553,6 @@ void ExternalCommandProcessor::ScheduleHostSvcChecks(double, const std::vectorGetName() << "'"; service->SetNextCheck(planned_check); - - /* trigger update event for DB IDO */ - Checkable::OnNextCheckUpdated(service); } }