From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Thu, 12 Sep 2013 13:47:45 +0000 (+0200)
Subject: Make sure the next check timestamp can't be in the past.
X-Git-Tag: v0.0.3~534
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb7d9e96f89f029476c8f94e379f21f30d5e2c9f;p=icinga2

Make sure the next check timestamp can't be in the past.
---

diff --git a/lib/icinga/externalcommandprocessor.cpp b/lib/icinga/externalcommandprocessor.cpp
index e478346ae..aa1b9ca62 100644
--- a/lib/icinga/externalcommandprocessor.cpp
+++ b/lib/icinga/externalcommandprocessor.cpp
@@ -266,6 +266,9 @@ void ExternalCommandProcessor::ScheduleHostCheck(double, const std::vector<Strin
 
 	Log(LogInformation, "icinga", "Rescheduling next check for host '" + arguments[0] + "'");
 
+	if (planned_check < Utility::GetTime())
+		planned_check = Utility::GetTime();
+
 	{
 		ObjectLock olock(hc);
 
@@ -315,6 +318,9 @@ void ExternalCommandProcessor::ScheduleSvcCheck(double, const std::vector<String
 
 	Log(LogInformation, "icinga", "Rescheduling next check for service '" + arguments[1] + "'");
 
+	if (planned_check < Utility::GetTime())
+		planned_check = Utility::GetTime();
+
 	{
 		ObjectLock olock(service);
 
@@ -453,6 +459,9 @@ void ExternalCommandProcessor::ScheduleHostSvcChecks(double, const std::vector<S
 
 	Host::Ptr host = Host::GetByName(arguments[0]);
 
+	if (planned_check < Utility::GetTime())
+		planned_check = Utility::GetTime();
+
 	BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) {
 		if (planned_check > service->GetNextCheck()) {
 			Log(LogInformation, "icinga", "Ignoring reschedule request for service '" +