Pass std::exception_ptr to SendJsonError

The `diagnostic_information` string will now generated if and
when it is required (i.e. the "verbose" parameter is true).

Author: jschmidt-icinga

lib/remote/actionshandler.cpp

@@ -56,8 +56,7 @@ bool ActionsHandler::HandleRequest(
 			objs = FilterUtility::GetFilterTargets(qd, params, user);
 		} catch (const std::exception& ex) {
 			HttpUtility::SendJsonError(response, params, 404,
-				"No objects found.",
-				DiagnosticInformation(ex));
+				"No objects found.", std::current_exception());
 			return true;
 		}
 

lib/remote/configfileshandler.cpp

@@ -86,7 +86,7 @@ bool ConfigFilesHandler::HandleRequest(
 			throw;
 		}
 
-		HttpUtility::SendJsonError(response, params, 500, "Could not read file.", DiagnosticInformation(ex));
+		HttpUtility::SendJsonError(response, params, 500, "Could not read file.", std::current_exception());
 	}
 
 	return true;

lib/remote/configpackageshandler.cpp

@@ -55,8 +55,7 @@ void ConfigPackagesHandler::HandleGet(const HttpApiRequest& request, HttpApiResp
 	try {
 		packages = ConfigPackageUtility::GetPackages();
 	} catch (const std::exception& ex) {
-		HttpUtility::SendJsonError(response, params, 500, "Could not retrieve packages.",
-			DiagnosticInformation(ex));
+		HttpUtility::SendJsonError(response, params, 500, "Could not retrieve packages.", std::current_exception());
 		return;
 	}
 
@@ -121,8 +120,7 @@ void ConfigPackagesHandler::HandlePost(const HttpApiRequest& request, HttpApiRes
 
 		ConfigPackageUtility::CreatePackage(packageName);
 	} catch (const std::exception& ex) {
-		HttpUtility::SendJsonError(response, params, 500, "Could not create package '" + packageName + "'.",
-			DiagnosticInformation(ex));
+		HttpUtility::SendJsonError(response, params, 500, "Could not create package '" + packageName + "'.", std::current_exception());
 		return;
 	}
 
@@ -169,8 +167,7 @@ void ConfigPackagesHandler::HandleDelete(const HttpApiRequest& request, HttpApiR
 	try {
 		ConfigPackageUtility::DeletePackage(packageName);
 	} catch (const std::exception& ex) {
-		HttpUtility::SendJsonError(response, params, 500, "Failed to delete package '" + packageName + "'.",
-			DiagnosticInformation(ex));
+		HttpUtility::SendJsonError(response, params, 500, "Failed to delete package '" + packageName + "'.", std::current_exception());
 		return;
 	}
 

lib/remote/configstageshandler.cpp

@@ -174,8 +174,7 @@ void ConfigStagesHandler::HandlePost(const HttpApiRequest& request, HttpApiRespo
 		ConfigPackageUtility::AsyncTryActivateStage(packageName, stageName, activate, reload, resetPackageUpdates);
 	} catch (const std::exception& ex) {
 		return HttpUtility::SendJsonError(response, params, 500,
-			"Stage creation failed.",
-			DiagnosticInformation(ex));
+			"Stage creation failed.", std::current_exception());
 	}
 
 
@@ -237,7 +236,7 @@ void ConfigStagesHandler::HandleDelete(const HttpApiRequest& request, HttpApiRes
 	} catch (const std::exception& ex) {
 		return HttpUtility::SendJsonError(response, params, 500,
 			"Failed to delete stage '" + stageName + "' in package '" + packageName + "'.",
-			DiagnosticInformation(ex));
+			std::current_exception());
 	}
 
 	Dictionary::Ptr result1 = new Dictionary({

lib/remote/deleteobjecthandler.cpp

@@ -60,8 +60,7 @@ bool DeleteObjectHandler::HandleRequest(
 		objs = FilterUtility::GetFilterTargets(qd, params, user);
 	} catch (const std::exception& ex) {
 		HttpUtility::SendJsonError(response, params, 404,
-			"No objects found.",
-			DiagnosticInformation(ex));
+			"No objects found.", std::current_exception());
 		return true;
 	}
 

lib/remote/httpserverconnection.cpp

@@ -438,7 +438,7 @@ void ProcessRequest(
 			throw;
 		}
 
-		HttpUtility::SendJsonError(response, request.Params(), 500, "Unhandled exception", DiagnosticInformation(ex));
+		HttpUtility::SendJsonError(response, request.Params(), 500, "Unhandled exception", std::current_exception());
 	}
 
 	response.Flush(yc);

lib/remote/httputility.cpp

@@ -84,14 +84,14 @@ void HttpUtility::SendJsonBody(HttpApiResponse& response, const Dictionary::Ptr&
 }
 
 void HttpUtility::SendJsonError(HttpApiResponse& response,
-	const Dictionary::Ptr& params, int code, const String& info, const String& diagnosticInformation)
+	const Dictionary::Ptr& params, int code, const String& info, const std::exception_ptr& ex)
 {
 	if (response.HasSerializationStarted()) {
 		std::ostringstream err;
 		err << "Impossible to send error response after streaming has started: error: '" << code << "', status: '"
 			<< info << "'";
-		if (!diagnosticInformation.IsEmpty()) {
-			err << ", diagnostic_information: '" << diagnosticInformation << "'";
+		if (ex) {
+			err << ", diagnostic_information: '" << DiagnosticInformation(ex) << "'";
 		}
 		BOOST_THROW_EXCEPTION(std::logic_error{err.str()});
 	}
@@ -102,8 +102,8 @@ void HttpUtility::SendJsonError(HttpApiResponse& response,
 		result->Set("status", info);
 	}
 
-	if (params && HttpUtility::GetLastParameter(params, "verbose") && !diagnosticInformation.IsEmpty()) {
-		result->Set("diagnostic_information", diagnosticInformation);
+	if (params && HttpUtility::GetLastParameter(params, "verbose") && ex) {
+		result->Set("diagnostic_information", DiagnosticInformation(ex));
 	}
 
 	response.Clear();

lib/remote/httputility.hpp

@@ -28,7 +28,7 @@ class HttpUtility
 	static void SendJsonBody(HttpApiResponse& response, const Dictionary::Ptr& params, const Value& val, boost::asio::yield_context& yc);
 	static void SendJsonBody(HttpApiResponse& response, const Dictionary::Ptr& params, const Value& val);
 	static void SendJsonError(HttpApiResponse& response, const Dictionary::Ptr& params, const int code,
-		const String& info = {}, const String& diagnosticInformation = {});
+		const String& info = {}, const std::exception_ptr& ex = nullptr);
 
 	static bool IsValidHeaderName(std::string_view name);
 	static bool IsValidHeaderValue(std::string_view value);

lib/remote/modifyobjecthandler.cpp

@@ -58,8 +58,7 @@ bool ModifyObjectHandler::HandleRequest(
 		objs = FilterUtility::GetFilterTargets(qd, params, user);
 	} catch (const std::exception& ex) {
 		HttpUtility::SendJsonError(response, params, 404,
-			"No objects found.",
-			DiagnosticInformation(ex));
+			"No objects found.", std::current_exception());
 		return true;
 	}
 

lib/remote/objectqueryhandler.cpp

@@ -180,8 +180,7 @@ bool ObjectQueryHandler::HandleRequest(
 		objs = FilterUtility::GetFilterTargets(qd, params, user);
 	} catch (const std::exception& ex) {
 		HttpUtility::SendJsonError(response, params, 404,
-			"No objects found.",
-			DiagnosticInformation(ex));
+			"No objects found.", std::current_exception());
 		return true;
 	}