Drop the now superfluous OnNextCheckUpdated signal

yhabteab · yhabteab · commit 3d513324ebc2 · 2025-09-24T10:15:41.000+02:00
diff --git 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
@@ -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;
 boost::signals2::signal<void (const Checkable::Ptr&, double)> Checkable::OnRescheduleCheck;
 
 Atomic<uint_fast64_t> Checkable::CurrentConcurrentChecks (0);
diff --git a/lib/icinga/checkable.hpp b/lib/icinga/checkable.hpp
@@ -147,7 +147,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;
 	/**
 	 * 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
@@ -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);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,6 @@ void CheckerComponent::CheckThreadProc()`
`138`	`138`
`139`	`139`	`bool forced = checkable->GetForceNextCheck();`
`140`	`140`	`bool check = true;`
`141`		`- bool notifyNextCheck = false;`
`142`	`141`	`double nextCheck = -1;`
`143`	`142`
`144`	`143`	`if (!forced) {`
`@@ -147,7 +146,6 @@ void CheckerComponent::CheckThreadProc()`
`147`	`146`	`<< "Skipping check for object '" << checkable->GetName() << "': Dependency failed.";`
`148`	`147`
`149`	`148`	`check = false;`
`150`		`- notifyNextCheck = true;`
`151`	`149`	`}`
`152`	`150`
`153`	`151`	`Host::Ptr host;`
`@@ -184,7 +182,6 @@ void CheckerComponent::CheckThreadProc()`
`184`	`182`	`<< Utility::FormatDateTime("%Y-%m-%d %H:%M:%S %z", nextCheck);`
`185`	`183`
`186`	`184`	`check = false;`
`187`		`- notifyNextCheck = true;`
`188`	`185`	`}`
`189`	`186`	`}`
`190`	`187`	`}`
`@@ -203,11 +200,6 @@ void CheckerComponent::CheckThreadProc()`
`203`	`200`	`checkable->UpdateNextCheck();`
`204`	`201`	`}`
`205`	`202`
`206`		`- if (notifyNextCheck) {`
`207`		`- // Trigger update event for Icinga DB`
`208`		`- Checkable::OnNextCheckUpdated(checkable);`
`209`		`- }`
`210`		`-`
`211`	`203`	`lock.lock();`
`212`	`204`
`213`	`205`	`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
`@@ -147,7 +147,6 @@ class Checkable : public ObjectImpl<Checkable>`
`147`	`147`	`bool, bool, double, double, const MessageOrigin::Ptr&)> OnAcknowledgementSet;`
`148`	`148`	`static boost::signals2::signal<void (const Checkable::Ptr&, const String&, double, const MessageOrigin::Ptr&)> OnAcknowledgementCleared;`
`149`	`149`	`static boost::signals2::signal<void (const Checkable::Ptr&, double)> OnFlappingChange;`
`150`		`- static boost::signals2::signal<void (const Checkable::Ptr&)> OnNextCheckUpdated;`
`151`	`150`	`/**`
`152`	`151`	`* Think again! Are you really sure you want to subscribe to this signal?`
`153`	`152`	`*`
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`