API: Display a correct status when removing a scheduled downtime

Icinga · Nov 15, 2020 · 4167624 · 4167624
1 parent 04704a4
commit 4167624
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 21 deletions.
diff --git a/lib/icinga/apiactions.cpp b/lib/icinga/apiactions.cpp
@@ -488,7 +488,11 @@ Dictionary::Ptr ApiActions::RemoveDowntime(const ConfigObject::Ptr& object,
 				downtime->SetRemovedBy(author);
 			}
 
-			Downtime::RemoveDowntime(downtime->GetName(), true);
+			try {
+				Downtime::RemoveDowntime(downtime->GetName(), true);
+			} catch (std::runtime_error& error) {
+				return ApiActions::CreateResult(400, error.what());
+			}
 		}
 
 		return ApiActions::CreateResult(200, "Successfully removed all downtimes for object '" + checkable->GetName() + "'.");
@@ -504,11 +508,13 @@ Dictionary::Ptr ApiActions::RemoveDowntime(const ConfigObject::Ptr& object,
 		downtime->SetRemovedBy(author);
 	}
 
-	String downtimeName = downtime->GetName();
-
-	Downtime::RemoveDowntime(downtimeName, true);
+	try {
+		Downtime::RemoveDowntime(downtime->GetName(), true);
 
-	return ApiActions::CreateResult(200, "Successfully removed downtime '" + downtimeName + "'.");
+		return ApiActions::CreateResult(200, "Successfully removed downtime '" + downtime->GetName() + "'.");
+	} catch (std::runtime_error& error) {
+		return ApiActions::CreateResult(400, error.what());
+	}
 }
 
 Dictionary::Ptr ApiActions::ShutdownProcess(const ConfigObject::Ptr& object,

diff --git a/lib/icinga/downtime.cpp b/lib/icinga/downtime.cpp
@@ -317,9 +317,14 @@ void Downtime::RemoveDowntime(const String& id, bool cancelled, bool expired, co
 	String config_owner = downtime->GetConfigOwner();
 
 	if (!config_owner.IsEmpty() && !expired) {
-		Log(LogWarning, "Downtime")
-			<< "Cannot remove downtime '" << downtime->GetName() << "'. It is owned by scheduled downtime object '" << config_owner << "'";
-		return;
+		{
+			String errorMessage = "Cannot remove downtime '" + downtime->GetName() +
+					"'. It is owned by scheduled downtime object '" + config_owner + "'";
+
+			Log(LogWarning, "Downtime") << errorMessage;
+
+			throw std::runtime_error(errorMessage);
+		}
 	}
 
 	downtime->SetWasCancelled(cancelled);

diff --git a/lib/icinga/externalcommandprocessor.cpp b/lib/icinga/externalcommandprocessor.cpp
@@ -24,6 +24,7 @@
 
 using namespace icinga;
 
+bool ExternalCommandProcessor::m_DownTimeRemoved;
 boost::signals2::signal<void(double, const String&, const std::vector<String>&)> ExternalCommandProcessor::OnNewExternalCommand;
 
 void ExternalCommandProcessor::Execute(const String& line)
@@ -970,10 +971,19 @@ void ExternalCommandProcessor::ScheduleSvcDowntime(double, const std::vector<Str
 void ExternalCommandProcessor::DelSvcDowntime(double, const std::vector<String>& arguments)
 {
 	int id = Convert::ToLong(arguments[0]);
-	Log(LogNotice, "ExternalCommandProcessor")
-		<< "Removing downtime ID " << arguments[0];
+	m_DownTimeRemoved = false;
 	String rid = Downtime::GetDowntimeIDFromLegacyID(id);
-	Downtime::RemoveDowntime(rid, true);
+
+	try {
+		Downtime::RemoveDowntime(rid, true);
+	} catch (std::runtime_error& error) {
+		m_DownTimeRemoved = true;
+		Log(LogWarning, error.what());
+	}
+
+	if (!m_DownTimeRemoved)
+		Log(LogNotice, "ExternalCommandProcessor")
+				<< "Removing downtime ID " << arguments[0];
 }
 
 void ExternalCommandProcessor::ScheduleHostDowntime(double, const std::vector<String>& arguments)
@@ -1072,10 +1082,19 @@ void ExternalCommandProcessor::ScheduleAndPropagateTriggeredHostDowntime(double,
 void ExternalCommandProcessor::DelHostDowntime(double, const std::vector<String>& arguments)
 {
 	int id = Convert::ToLong(arguments[0]);
-	Log(LogNotice, "ExternalCommandProcessor")
-		<< "Removing downtime ID " << arguments[0];
 	String rid = Downtime::GetDowntimeIDFromLegacyID(id);
-	Downtime::RemoveDowntime(rid, true);
+	m_DownTimeRemoved = false;
+
+	try {
+		Downtime::RemoveDowntime(rid, true);
+	} catch (std::runtime_error& error) {
+		m_DownTimeRemoved = true;
+		Log(LogWarning, error.what());
+	}
+
+	if (!m_DownTimeRemoved)
+		Log(LogNotice, "ExternalCommandProcessor")
+				<< "Removing downtime ID " << arguments[0];
 }
 
 void ExternalCommandProcessor::DelDowntimeByHostName(double, const std::vector<String>& arguments)
@@ -1101,13 +1120,24 @@ void ExternalCommandProcessor::DelDowntimeByHostName(double, const std::vector<S
 		Log(LogWarning, "ExternalCommandProcessor")
 			<< ("Ignoring additional parameters for host '" + arguments[0] + "' downtime deletion.");
 
+	m_DownTimeRemoved = false;
+	String downTimeName;
 	for (const Downtime::Ptr& downtime : host->GetDowntimes()) {
-		Log(LogNotice, "ExternalCommandProcessor")
-			<< "Removing downtime '" << downtime->GetName() << "'.";
+		downTimeName = downtime->GetName();
 
-		Downtime::RemoveDowntime(downtime->GetName(), true);
+		try {
+			Downtime::RemoveDowntime(downtime->GetName(), true);
+		} catch (std::runtime_error& error) {
+			m_DownTimeRemoved = true;
+			Log(LogWarning, error.what());
+		}
+
+		if (!m_DownTimeRemoved)
+			Log(LogNotice, "ExternalCommandProcessor")
+					<< "Removing downtime '" << downTimeName << "'.";
 	}
 
+	m_DownTimeRemoved = false;
 	for (const Service::Ptr& service : host->GetServices()) {
 		if (!serviceName.IsEmpty() && serviceName != service->GetName())
 			continue;
@@ -1119,10 +1149,19 @@ void ExternalCommandProcessor::DelDowntimeByHostName(double, const std::vector<S
 			if (!commentString.IsEmpty() && downtime->GetComment() != commentString)
 				continue;
 
-			Log(LogNotice, "ExternalCommandProcessor")
-				<< "Removing downtime '" << downtime->GetName() << "'.";
+			downTimeName = downtime->GetName();
 
-			Downtime::RemoveDowntime(downtime->GetName(), true);
+			try {
+				Downtime::RemoveDowntime(downtime->GetName(), true);
+			} catch (std::runtime_error& error) {
+				m_DownTimeRemoved = true;
+				Log(LogWarning, error.what());
+			}
+
+			if (!m_DownTimeRemoved) {
+				Log(LogNotice, "ExternalCommandProcessor")
+						<< "Removing downtime '" << downtime->GetName() << "'.";
+			}
 		}
 	}
 }

diff --git a/lib/icinga/externalcommandprocessor.hpp b/lib/icinga/externalcommandprocessor.hpp
@@ -161,7 +161,7 @@ class ExternalCommandProcessor {
 
 	static boost::mutex& GetMutex();
 	static std::map<String, ExternalCommandInfo>& GetCommands();
-
+	static bool m_DownTimeRemoved;
 };
 
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -161,7 +161,7 @@ class ExternalCommandProcessor { @@
     	static boost::mutex& GetMutex();
     	static std::map<String, ExternalCommandInfo>& GetCommands();
+    	static bool m_DownTimeRemoved;
     };
     }
@@ Expand Down @@