mirror of
https://github.com/Icinga/icinga2.git
synced 2026-02-18 18:19:13 -05:00
Merge branch 'feature/forced-check-now-runtime-attribute-7105' into HEAD
This commit is contained in:
commit
ff6b162fe4
1 changed files with 7 additions and 5 deletions
|
|
@ -224,11 +224,6 @@ void CheckerComponent::CheckThreadProc()
|
|||
|
||||
lock.unlock();
|
||||
|
||||
if (forced) {
|
||||
ObjectLock olock(checkable);
|
||||
checkable->SetForceNextCheck(false);
|
||||
}
|
||||
|
||||
Log(LogDebug, "CheckerComponent")
|
||||
<< "Executing check for '" << checkable->GetName() << "'";
|
||||
|
||||
|
|
@ -268,6 +263,13 @@ void CheckerComponent::ExecuteCheckHelper(const Checkable::Ptr& checkable)
|
|||
Log(LogCritical, "checker", output);
|
||||
}
|
||||
|
||||
{
|
||||
ObjectLock oLock (checkable);
|
||||
if (checkable->GetForceNextCheck()) {
|
||||
checkable->SetForceNextCheck(false);
|
||||
}
|
||||
}
|
||||
|
||||
Checkable::DecreasePendingChecks();
|
||||
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue