Skip to content

Commit ac841b3

Browse files
committed
IcingaDB: subscribe to OnNextCheckChanged signal
We can't drop the `OnNextCheckUpdated` signal entirely yet, as IDO still relies on it.
1 parent ab61b19 commit ac841b3

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

lib/icingadb/icingadb-objects.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ void IcingaDB::ConfigStaticInitialize()
156156
IcingaDB::NewCheckResultHandler(checkable);
157157
});
158158

159-
Checkable::OnNextCheckUpdated.connect([](const Checkable::Ptr& checkable) {
160-
IcingaDB::NextCheckUpdatedHandler(checkable);
159+
Checkable::OnNextCheckChanged.connect([](const Checkable::Ptr& checkable, const Value&) {
160+
IcingaDB::NextCheckChangedHandler(checkable);
161161
});
162162

163163
Service::OnHostProblemChanged.connect([](const Service::Ptr& service, const CheckResult::Ptr&, const MessageOrigin::Ptr&) {
@@ -3076,7 +3076,7 @@ void IcingaDB::NewCheckResultHandler(const Checkable::Ptr& checkable)
30763076
}
30773077
}
30783078

3079-
void IcingaDB::NextCheckUpdatedHandler(const Checkable::Ptr& checkable)
3079+
void IcingaDB::NextCheckChangedHandler(const Checkable::Ptr& checkable)
30803080
{
30813081
for (auto& rw : ConfigType::GetObjectsByType<IcingaDB>()) {
30823082
rw->EnqueueConfigObject(checkable, VolatileState | NextUpdate);

lib/icingadb/icingadb.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ class IcingaDB : public ObjectImpl<IcingaDB>
383383
static void CommentRemovedHandler(const Comment::Ptr& comment);
384384
static void FlappingChangeHandler(const Checkable::Ptr& checkable, double changeTime);
385385
static void NewCheckResultHandler(const Checkable::Ptr& checkable);
386-
static void NextCheckUpdatedHandler(const Checkable::Ptr& checkable);
386+
static void NextCheckChangedHandler(const Checkable::Ptr& checkable);
387387
static void DependencyGroupChildRegisteredHandler(const Checkable::Ptr& child, const DependencyGroup::Ptr& dependencyGroup);
388388
static void DependencyGroupChildRemovedHandler(const DependencyGroup::Ptr& dependencyGroup, const std::vector<Dependency::Ptr>& dependencies, bool removeGroup);
389389
static void HostProblemChangedHandler(const Service::Ptr& service);

0 commit comments

Comments
 (0)