Fix issue 5022

diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp
index 35c406d06c2d60f0675b27032b5f85ebecb9e25b..c836f07269bfe3a437fdfbd1abc908fe690f1b1d 100644 (file)
--- 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);
+                       }
                }
        }