From: Alexander A. Klimov <alexander.klimov@icinga.com>
Date: Wed, 9 Jan 2019 10:27:33 +0000 (+0100)
Subject: Allow Checkable#retry_interval to be 0
X-Git-Tag: v2.10.3~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9040c9b5127dea2a435fd22b78a1653754d862d5;p=icinga2

Allow Checkable#retry_interval to be 0

refs #6871

(cherry picked from commit 9ae738d17fa6220d988001e4c56155aa6535992c)
---

diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp
index e70648d89..b159247a9 100644
--- a/lib/icinga/checkable-check.cpp
+++ b/lib/icinga/checkable-check.cpp
@@ -79,7 +79,8 @@ void Checkable::UpdateNextCheck(const MessageOrigin::Ptr& origin)
 	if (interval > 1)
 		adj = fmod(now * 100 + GetSchedulingOffset(), interval * 100) / 100.0;
 
-	adj = std::min(0.5 + fmod(GetSchedulingOffset(), interval * 5) / 100.0, adj);
+	if (adj != 0.0)
+		adj = std::min(0.5 + fmod(GetSchedulingOffset(), interval * 5) / 100.0, adj);
 
 	double nextCheck = now - adj + interval;