mirror of
https://github.com/Icinga/icinga2.git
synced 2025-09-26 02:58:43 +02:00
Drop the now superfluous OnNextCheckUpdated
signal
This commit is contained in:
parent
b1e3a8a436
commit
a58a69f715
@ -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;
|
||||
|
@ -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() + "'.");
|
||||
}
|
||||
|
||||
|
@ -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);
|
||||
|
@ -147,7 +147,6 @@ public:
|
||||
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?
|
||||
*
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user