From: Jordi van Scheijen <jordi.vanscheijen@solvinity.com>
Date: Thu, 22 Jun 2017 10:31:32 +0000 (+0200)
Subject: Fix issue 5022
X-Git-Tag: v2.10.0~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc1dc9c7a7a9b5fb965e76a02ed9adb482429277;p=icinga2

Fix issue 5022
---

diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp
index 35c406d06..c836f0726 100644
--- a/lib/icinga/checkable-check.cpp
+++ b/lib/icinga/checkable-check.cpp
@@ -260,8 +260,13 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
 			if (parent.get() == this)
 				continue;
 
-			ObjectLock olock(parent);
-			parent->SetNextCheck(Utility::GetTime());
+			if (!parent->GetEnableActiveChecks())
+				continue;
+
+			if (parent->GetNextCheck() >= now + parent->GetRetryInterval()) {
+				ObjectLock olock(parent);
+				parent->SetNextCheck(now);
+			}
 		}
 	}