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

checker: Fix waiting for non-authoritative checks.

This commit is contained in:
Gunnar Beutner 2013-09-12 15:31:07 +02:00
parent 5cdf08c371
commit 7bc99d3860
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/checker/checkercomponent.cpp
View File

@ -90,6 +90,11 @@ void CheckerComponent::CheckThreadProc(void)
double wait = service->GetNextCheck() - Utility::GetTime(); double wait = service->GetNextCheck() - Utility::GetTime();
bool authoritative = service->HasAuthority("checker");
if (!authoritative)
wait = 60;
if (wait > 0) { if (wait > 0) {
/* Make sure the service we just examined can be destroyed while we're waiting. */ /* Make sure the service we just examined can be destroyed while we're waiting. */
service.reset(); service.reset();
@ -105,12 +110,6 @@ void CheckerComponent::CheckThreadProc(void)
bool forced = service->GetForceNextCheck(); bool forced = service->GetForceNextCheck();
bool check = true; bool check = true;
bool authoritative = service->HasAuthority("checker");
if (!authoritative) {
Log(LogDebug, "checker", "Skipping check for service '" + service->GetName() + "': not authoritative");
check = false;
}
if (!forced) { if (!forced) {
if (!service->GetEnableActiveChecks()) { if (!service->GetEnableActiveChecks()) {