tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CheckerComponent#Stop(): don't wait for checks 

refs #7888
This commit is contained in:
Alexander A. Klimov 2020-03-05 14:33:31 +01:00
parent a96403331f
commit cd2ffd175b
1 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/checker/checkercomponent.cpp
View File

@ -74,30 +74,6 @@ void CheckerComponent::Stop(bool runtimeRemoved)
m_CV.notify_all(); m_CV.notify_all();
} }
double wait = 0.0;
while (Checkable::GetPendingChecks() > 0) {
Log(LogDebug, "CheckerComponent")
<< "Waiting for running checks (" << Checkable::GetPendingChecks()
<< ") to finish. Waited for " << wait << " seconds now.";
Utility::Sleep(0.1);
wait += 0.1;
/* Pick a timeout slightly shorther than the process reload timeout. */
double reloadTimeout = Application::GetReloadTimeout();
double waitMax = reloadTimeout - 30;
if (waitMax <= 0)
waitMax = 1;
if (wait > waitMax) {
Log(LogWarning, "CheckerComponent")
<< "Checks running too long for " << wait
<< " seconds, hard shutdown before reload timeout: " << reloadTimeout << ".";
break;
}
}
m_ResultTimer->Stop(); m_ResultTimer->Stop();
m_Thread.join(); m_Thread.join();