]> granicus.if.org Git - icinga2/commitdiff
Checker: Fix exception on disabled host checks.
authorMichael Friedrich <Michael.Friedrich@netways.de>
Thu, 1 May 2014 19:57:58 +0000 (21:57 +0200)
committerMichael Friedrich <Michael.Friedrich@netways.de>
Thu, 1 May 2014 19:57:58 +0000 (21:57 +0200)
Fixes #6103

components/checker/checkercomponent.cpp

index a050ecc131f9e958482484cb379a4dd66a894b33..808bf6d62a82ded40c1ecfc9ed5a35e867527dd0 100644 (file)
@@ -147,11 +147,11 @@ void CheckerComponent::CheckThreadProc(void)
                        Service::Ptr service;
                        tie(host, service) = GetHostService(checkable);
 
-                       if (!checkable->GetEnableActiveChecks() || (host && !service && !IcingaApplication::GetInstance()->GetEnableHostChecks())) {
+                       if (host && !service && (!checkable->GetEnableActiveChecks() || !IcingaApplication::GetInstance()->GetEnableHostChecks())) {
                                Log(LogDebug, "checker", "Skipping check for host '" + host->GetName() + "': active host checks are disabled");
                                check = false;
                        }
-                       if (!checkable->GetEnableActiveChecks() || (host && service && !IcingaApplication::GetInstance()->GetEnableServiceChecks())) {
+                       if (host && service && (!checkable->GetEnableActiveChecks() || !IcingaApplication::GetInstance()->GetEnableServiceChecks())) {
                                Log(LogDebug, "checker", "Skipping check for service '" + service->GetName() + "': active service checks are disabled");
                                check = false;
                        }