Execute initial checks immediately

refs #5083
Icinga · Mar 23, 2017 · 687153b · 687153b
1 parent f169232
commit 687153b
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp
@@ -67,7 +67,7 @@ void Checkable::UpdateNextCheck(const MessageOrigin::Ptr& origin)
 {
 	double interval;
 
-	if (GetStateType() == StateTypeSoft && GetLastCheckResult() != NULL)
+	if (GetStateType() == StateTypeSoft && HasBeenChecked())
 		interval = GetRetryInterval();
 	else
 		interval = GetCheckInterval();
@@ -80,7 +80,10 @@ void Checkable::UpdateNextCheck(const MessageOrigin::Ptr& origin)
 
 	adj = std::min(0.5 + fmod(GetSchedulingOffset(), interval * 5) / 100.0, adj);
 
-	SetNextCheck(now - adj + interval, false, origin);
+	if (HasBeenChecked())
+		SetNextCheck(now - adj + interval, false, origin);
+	else
+		SetNextCheck(now, false, origin);
 }
 
 bool Checkable::HasBeenChecked(void) const