Merge pull request #9598 from Icinga/9596

CheckerComponent#CheckThreadProc(): also propagate next check update …
This commit is contained in:
Julian Brost 2023-02-01 20:09:06 +01:00 committed by GitHub
commit a0239e44f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions

View File

@ -134,12 +134,15 @@ void CheckerComponent::CheckThreadProc()
bool forced = checkable->GetForceNextCheck();
bool check = true;
bool notifyNextCheck = false;
if (!forced) {
if (!checkable->IsReachable(DependencyCheckExecution)) {
Log(LogNotice, "CheckerComponent")
<< "Skipping check for object '" << checkable->GetName() << "': Dependency failed.";
check = false;
notifyNextCheck = true;
}
Host::Ptr host;
@ -163,7 +166,9 @@ void CheckerComponent::CheckThreadProc()
Log(LogNotice, "CheckerComponent")
<< "Skipping check for object '" << checkable->GetName()
<< "': not in check period '" << tp->GetName() << "'";
check = false;
notifyNextCheck = true;
}
}
@ -177,6 +182,11 @@ void CheckerComponent::CheckThreadProc()
checkable->UpdateNextCheck();
if (notifyNextCheck) {
// Trigger update event for Icinga DB
Checkable::OnNextCheckUpdated(checkable);
}
lock.lock();
continue;