Chekcable: drop OnNextCheckUpdated signal & adjust all its users

yhabteab · yhabteab · commit 538c7664cdff · 2025-10-31T15:47:15.000+01:00
diff --git a/lib/checker/checkercomponent.cpp b/lib/checker/checkercomponent.cpp
@@ -135,7 +135,6 @@ void CheckerComponent::CheckThreadProc()
 
 		bool forced = checkable->GetForceNextCheck();
 		bool check = true;
-		bool notifyNextCheck = false;
 		double nextCheck = -1;
 
 		if (!forced) {
@@ -144,7 +143,6 @@ void CheckerComponent::CheckThreadProc()
 					<< "Skipping check for object '" << checkable->GetName() << "': Dependency failed.";
 
 				check = false;
-				notifyNextCheck = true;
 			}
 
 			Host::Ptr host;
@@ -181,7 +179,6 @@ void CheckerComponent::CheckThreadProc()
 						<< Utility::FormatDateTime("%Y-%m-%d %H:%M:%S %z", nextCheck);
 
 					check = false;
-					notifyNextCheck = true;
 				}
 			}
 		}
@@ -200,11 +197,6 @@ void CheckerComponent::CheckThreadProc()
 				checkable->UpdateNextCheck();
 			}
 
-			if (notifyNextCheck) {
-				// Trigger update event for Icinga DB
-				Checkable::OnNextCheckUpdated(checkable);
-			}
-
 			lock.lock();
 
 			continue;
diff --git a/lib/db_ido/dbevents.cpp b/lib/db_ido/dbevents.cpp
@@ -40,7 +40,7 @@ void DbEvents::StaticInitialize()
 		DbEvents::RemoveAcknowledgement(checkable);
 	});
 
-	Checkable::OnNextCheckUpdated.connect([](const Checkable::Ptr& checkable) { NextCheckUpdatedHandler(checkable); });
+	Checkable::OnNextCheckChanged.connect([](const Checkable::Ptr& checkable, const Value&) { NextCheckChangedHandler(checkable); });
 	Checkable::OnFlappingChanged.connect([](const Checkable::Ptr& checkable, const Value&) { FlappingChangedHandler(checkable); });
 	Checkable::OnNotificationSentToAllUsers.connect([](const Notification::Ptr& notification, const Checkable::Ptr& checkable,
 		const std::set<User::Ptr>&, const NotificationType&, const CheckResult::Ptr&, const String&, const String&,
@@ -118,7 +118,7 @@ void DbEvents::StaticInitialize()
 }
 
 /* check events */
-void DbEvents::NextCheckUpdatedHandler(const Checkable::Ptr& checkable)
+void DbEvents::NextCheckChangedHandler(const Checkable::Ptr& checkable)
 {
 	Host::Ptr host;
 	Service::Ptr service;
diff --git a/lib/db_ido/dbevents.hpp b/lib/db_ido/dbevents.hpp
@@ -52,7 +52,7 @@ class DbEvents
 	static void AddLogHistory(const Checkable::Ptr& checkable, const String& buffer, LogEntryType type);
 
 	/* Status */
-	static void NextCheckUpdatedHandler(const Checkable::Ptr& checkable);
+	static void NextCheckChangedHandler(const Checkable::Ptr& checkable);
 	static void FlappingChangedHandler(const Checkable::Ptr& checkable);
 	static void LastNotificationChangedHandler(const Notification::Ptr& notification, const Checkable::Ptr& checkable);
 
diff --git 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
@@ -22,7 +22,6 @@ boost::signals2::signal<void (const Checkable::Ptr&, const CheckResult::Ptr&, co
 boost::signals2::signal<void (const Checkable::Ptr&, const CheckResult::Ptr&, StateType, const MessageOrigin::Ptr&)> Checkable::OnStateChange;
 boost::signals2::signal<void (const Checkable::Ptr&, const CheckResult::Ptr&, std::set<Checkable::Ptr>, const MessageOrigin::Ptr&)> Checkable::OnReachabilityChanged;
 boost::signals2::signal<void (const Checkable::Ptr&, NotificationType, const CheckResult::Ptr&, const String&, const String&, const MessageOrigin::Ptr&)> Checkable::OnNotificationsRequested;
-boost::signals2::signal<void (const Checkable::Ptr&)> Checkable::OnNextCheckUpdated;
 
 Atomic<uint_fast64_t> Checkable::CurrentConcurrentChecks (0);
 
diff --git a/lib/icinga/checkable.hpp b/lib/icinga/checkable.hpp
@@ -146,7 +146,6 @@ class Checkable : public ObjectImpl<Checkable>
 		bool, bool, double, double, const MessageOrigin::Ptr&)> OnAcknowledgementSet;
 	static boost::signals2::signal<void (const Checkable::Ptr&, const String&, double, const MessageOrigin::Ptr&)> OnAcknowledgementCleared;
 	static boost::signals2::signal<void (const Checkable::Ptr&, double)> OnFlappingChange;
-	static boost::signals2::signal<void (const Checkable::Ptr&)> OnNextCheckUpdated;
 	static boost::signals2::signal<void (const Checkable::Ptr&)> OnEventCommandExecuted;
 
 	static Atomic<uint_fast64_t> CurrentConcurrentChecks;
diff --git a/lib/icinga/externalcommandprocessor.cpp b/lib/icinga/externalcommandprocessor.cpp
@@ -392,9 +392,6 @@ void ExternalCommandProcessor::ScheduleHostCheck(double, const std::vector<Strin
 		planned_check = Utility::GetTime();
 
 	host->SetNextCheck(planned_check);
-
-	/* trigger update event for DB IDO */
-	Checkable::OnNextCheckUpdated(host);
 }
 
 void ExternalCommandProcessor::ScheduleForcedHostCheck(double, const std::vector<String>& 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<String>& arguments)
@@ -437,9 +431,6 @@ void ExternalCommandProcessor::ScheduleSvcCheck(double, const std::vector<String
 		planned_check = Utility::GetTime();
 
 	service->SetNextCheck(planned_check);
-
-	/* trigger update event for DB IDO */
-	Checkable::OnNextCheckUpdated(service);
 }
 
 void ExternalCommandProcessor::ScheduleForcedSvcCheck(double, const std::vector<String>& 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<String>& 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::vector<S
 			<< "Rescheduling next check for service '" << service->GetName() << "'";
 
 		service->SetNextCheck(planned_check);
-
-		/* trigger update event for DB IDO */
-		Checkable::OnNextCheckUpdated(service);
 	}
 }
 
diff --git a/lib/icingadb/icingadb-objects.cpp b/lib/icingadb/icingadb-objects.cpp
@@ -152,8 +152,8 @@ void IcingaDB::ConfigStaticInitialize()
 		IcingaDB::NewCheckResultHandler(checkable);
 	});
 
-	Checkable::OnNextCheckUpdated.connect([](const Checkable::Ptr& checkable) {
-		IcingaDB::NextCheckUpdatedHandler(checkable);
+	Checkable::OnNextCheckChanged.connect([](const Checkable::Ptr& checkable, const Value&) {
+		IcingaDB::NextCheckChangedHandler(checkable);
 	});
 
 	Service::OnHostProblemChanged.connect([](const Service::Ptr& service, const CheckResult::Ptr&, const MessageOrigin::Ptr&) {
@@ -3083,7 +3083,7 @@ void IcingaDB::NewCheckResultHandler(const Checkable::Ptr& checkable)
 	}
 }
 
-void IcingaDB::NextCheckUpdatedHandler(const Checkable::Ptr& checkable)
+void IcingaDB::NextCheckChangedHandler(const Checkable::Ptr& checkable)
 {
 	for (auto& rw : ConfigType::GetObjectsByType<IcingaDB>()) {
 		rw->EnqueueConfigObject(checkable, VolatileState | NextUpdate);
diff --git a/lib/icingadb/icingadb.hpp b/lib/icingadb/icingadb.hpp
@@ -369,7 +369,7 @@ class IcingaDB : public ObjectImpl<IcingaDB>
 	static void CommentRemovedHandler(const Comment::Ptr& comment);
 	static void FlappingChangeHandler(const Checkable::Ptr& checkable, double changeTime);
 	static void NewCheckResultHandler(const Checkable::Ptr& checkable);
-	static void NextCheckUpdatedHandler(const Checkable::Ptr& checkable);
+	static void NextCheckChangedHandler(const Checkable::Ptr& checkable);
 	static void DependencyGroupChildRegisteredHandler(const Checkable::Ptr& child, const DependencyGroup::Ptr& dependencyGroup);
 	static void DependencyGroupChildRemovedHandler(const DependencyGroup::Ptr& dependencyGroup, const std::vector<Dependency::Ptr>& dependencies, bool removeGroup);
 	static void HostProblemChangedHandler(const Service::Ptr& service);

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,6 @@ void CheckerComponent::CheckThreadProc()`
`135`	`135`
`136`	`136`	`bool forced = checkable->GetForceNextCheck();`
`137`	`137`	`bool check = true;`
`138`		`- bool notifyNextCheck = false;`
`139`	`138`	`double nextCheck = -1;`
`140`	`139`
`141`	`140`	`if (!forced) {`
`@@ -144,7 +143,6 @@ void CheckerComponent::CheckThreadProc()`
`144`	`143`	`<< "Skipping check for object '" << checkable->GetName() << "': Dependency failed.";`
`145`	`144`
`146`	`145`	`check = false;`
`147`		`- notifyNextCheck = true;`
`148`	`146`	`}`
`149`	`147`
`150`	`148`	`Host::Ptr host;`
`@@ -181,7 +179,6 @@ void CheckerComponent::CheckThreadProc()`
`181`	`179`	`<< Utility::FormatDateTime("%Y-%m-%d %H:%M:%S %z", nextCheck);`
`182`	`180`
`183`	`181`	`check = false;`
`184`		`- notifyNextCheck = true;`
`185`	`182`	`}`
`186`	`183`	`}`
`187`	`184`	`}`
`@@ -200,11 +197,6 @@ void CheckerComponent::CheckThreadProc()`
`200`	`197`	`checkable->UpdateNextCheck();`
`201`	`198`	`}`
`202`	`199`
`203`		`- if (notifyNextCheck) {`
`204`		`- // Trigger update event for Icinga DB`
`205`		`- Checkable::OnNextCheckUpdated(checkable);`
`206`		`- }`
`207`		`-`
`208`	`200`	`lock.lock();`
`209`	`201`
`210`	`202`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -159,9 +159,6 @@ Dictionary::Ptr ApiActions::RescheduleCheck(const ConfigObject::Ptr& object,`
`159`	`159`
`160`	`160`	`checkable->SetNextCheck(nextCheck);`
`161`	`161`
`162`		`- /* trigger update event for DB IDO */`
`163`		`- Checkable::OnNextCheckUpdated(checkable);`
`164`		`-`
`165`	`162`	`return ApiActions::CreateResult(200, "Successfully rescheduled check for object '" + checkable->GetName() + "'.");`
`166`	`163`	`}`
`167`	`164`
Original file line number	Diff line number	Diff line change
`@@ -392,9 +392,6 @@ void ExternalCommandProcessor::ScheduleHostCheck(double, const std::vector<Strin`
`392`	`392`	`planned_check = Utility::GetTime();`
`393`	`393`
`394`	`394`	`host->SetNextCheck(planned_check);`
`395`		`-`
`396`		`- /* trigger update event for DB IDO */`
`397`		`- Checkable::OnNextCheckUpdated(host);`
`398`	`395`	`}`
`399`	`396`
`400`	`397`	`void ExternalCommandProcessor::ScheduleForcedHostCheck(double, const std::vector<String>& arguments)`
`@@ -409,9 +406,6 @@ void ExternalCommandProcessor::ScheduleForcedHostCheck(double, const std::vector`
`409`	`406`
`410`	`407`	`host->SetForceNextCheck(true);`
`411`	`408`	`host->SetNextCheck(Convert::ToDouble(arguments[1]));`
`412`		`-`
`413`		`- /* trigger update event for DB IDO */`
`414`		`- Checkable::OnNextCheckUpdated(host);`
`415`	`409`	`}`
`416`	`410`
`417`	`411`	`void ExternalCommandProcessor::ScheduleSvcCheck(double, const std::vector<String>& arguments)`
`@@ -437,9 +431,6 @@ void ExternalCommandProcessor::ScheduleSvcCheck(double, const std::vector<String`
`437`	`431`	`planned_check = Utility::GetTime();`
`438`	`432`
`439`	`433`	`service->SetNextCheck(planned_check);`
`440`		`-`
`441`		`- /* trigger update event for DB IDO */`
`442`		`- Checkable::OnNextCheckUpdated(service);`
`443`	`434`	`}`
`444`	`435`
`445`	`436`	`void ExternalCommandProcessor::ScheduleForcedSvcCheck(double, const std::vector<String>& arguments)`
`@@ -454,9 +445,6 @@ void ExternalCommandProcessor::ScheduleForcedSvcCheck(double, const std::vector<`
`454`	`445`
`455`	`446`	`service->SetForceNextCheck(true);`
`456`	`447`	`service->SetNextCheck(Convert::ToDouble(arguments[2]));`
`457`		`-`
`458`		`- /* trigger update event for DB IDO */`
`459`		`- Checkable::OnNextCheckUpdated(service);`
`460`	`448`	`}`
`461`	`449`
`462`	`450`	`void ExternalCommandProcessor::EnableHostCheck(double, const std::vector<String>& arguments)`
`@@ -538,9 +526,6 @@ void ExternalCommandProcessor::ScheduleForcedHostSvcChecks(double, const std::ve`
`538`	`526`
`539`	`527`	`service->SetNextCheck(planned_check);`
`540`	`528`	`service->SetForceNextCheck(true);`
`541`		`-`
`542`		`- /* trigger update event for DB IDO */`
`543`		`- Checkable::OnNextCheckUpdated(service);`
`544`	`529`	`}`
`545`	`530`	`}`
`546`	`531`
`@@ -568,9 +553,6 @@ void ExternalCommandProcessor::ScheduleHostSvcChecks(double, const std::vector<S`
`568`	`553`	`<< "Rescheduling next check for service '" << service->GetName() << "'";`
`569`	`554`
`570`	`555`	`service->SetNextCheck(planned_check);`
`571`		`-`
`572`		`- /* trigger update event for DB IDO */`
`573`		`- Checkable::OnNextCheckUpdated(service);`
`574`	`556`	`}`
`575`	`557`	`}`
`576`	`558`
Original file line number	Diff line number	Diff line change
`@@ -152,8 +152,8 @@ void IcingaDB::ConfigStaticInitialize()`
`152`	`152`	`IcingaDB::NewCheckResultHandler(checkable);`
`153`	`153`	`});`
`154`	`154`
`155`		`- Checkable::OnNextCheckUpdated.connect([](const Checkable::Ptr& checkable) {`
`156`		`- IcingaDB::NextCheckUpdatedHandler(checkable);`
	`155`	`+ Checkable::OnNextCheckChanged.connect([](const Checkable::Ptr& checkable, const Value&) {`
	`156`	`+ IcingaDB::NextCheckChangedHandler(checkable);`
`157`	`157`	`});`
`158`	`158`
`159`	`159`	`Service::OnHostProblemChanged.connect([](const Service::Ptr& service, const CheckResult::Ptr&, const MessageOrigin::Ptr&) {`
`@@ -3083,7 +3083,7 @@ void IcingaDB::NewCheckResultHandler(const Checkable::Ptr& checkable)`
`3083`	`3083`	`}`
`3084`	`3084`	`}`
`3085`	`3085`
`3086`		`-void IcingaDB::NextCheckUpdatedHandler(const Checkable::Ptr& checkable)`
	`3086`	`+void IcingaDB::NextCheckChangedHandler(const Checkable::Ptr& checkable)`
`3087`	`3087`	`{`
`3088`	`3088`	`for (auto& rw : ConfigType::GetObjectsByType<IcingaDB>()) {`
`3089`	`3089`	`rw->EnqueueConfigObject(checkable, VolatileState \| NextUpdate);`