(WIP) Adapt handlers to use AsioFuture where sensible

Author: jschmidt-icinga

lib/remote/configpackageshandler.cpp

@@ -6,6 +6,7 @@
 #include "remote/httputility.hpp"
 #include "remote/filterutility.hpp"
 #include "base/exception.hpp"
+#include "base/io-future.hpp"
 
 using namespace icinga;
 
@@ -20,23 +21,25 @@ bool ConfigPackagesHandler::HandleRequest(
 {
 	namespace http = boost::beast::http;
 
-	auto url = request.Url();
-	auto user = request.User();
-	auto params = request.Params();
-
-	if (url->GetPath().size() > 4)
-		return false;
-
-	if (request.method() == http::verb::get)
-		HandleGet(request, response);
-	else if (request.method() == http::verb::post)
-		HandlePost(request, response);
-	else if (request.method() == http::verb::delete_)
-		HandleDelete(request, response);
-	else
-		return false;
-
-	return true;
+	return QueueAsioFutureCallback([&]() {
+		auto url = request.Url();
+		auto user = request.User();
+		auto params = request.Params();
+
+		if (url->GetPath().size() > 4)
+			return false;
+
+		if (request.method() == http::verb::get)
+			HandleGet(request, response);
+		else if (request.method() == http::verb::post)
+			HandlePost(request, response);
+		else if (request.method() == http::verb::delete_)
+			HandleDelete(request, response);
+		else
+			return false;
+
+		return true;
+	})->Get(yc);
 }
 
 void ConfigPackagesHandler::HandleGet(const HttpRequest& request, HttpResponse& response)

lib/remote/configstageshandler.cpp

@@ -8,6 +8,7 @@
 #include "base/application.hpp"
 #include "base/defer.hpp"
 #include "base/exception.hpp"
+#include "base/io-future.hpp"
 
 using namespace icinga;
 
@@ -27,23 +28,27 @@ bool ConfigStagesHandler::HandleRequest(
 {
 	namespace http = boost::beast::http;
 
-	auto url = request.Url();
-	auto user = request.User();
-	auto params = request.Params();
+	auto future = QueueAsioFutureCallback([&]() {
+		auto url = request.Url();
+		auto user = request.User();
+		auto params = request.Params();
 
-	if (url->GetPath().size() > 5)
-		return false;
+		if (url->GetPath().size() > 5)
+			return false;
 
-	if (request.method() == http::verb::get)
-		HandleGet(request, response);
-	else if (request.method() == http::verb::post)
-		HandlePost(request, response);
-	else if (request.method() == http::verb::delete_)
-		HandleDelete(request, response);
-	else
-		return false;
+		if (request.method() == http::verb::get)
+			HandleGet(request, response);
+		else if (request.method() == http::verb::post)
+			HandlePost(request, response);
+		else if (request.method() == http::verb::delete_)
+			HandleDelete(request, response);
+		else
+			return false;
+
+		return true;
+	});
 
-	return true;
+	return future->Get(yc);
 }
 
 void ConfigStagesHandler::HandleGet(const HttpRequest& request, HttpResponse& response)

lib/remote/createobjecthandler.cpp

@@ -9,17 +9,17 @@
 #include "remote/apiaction.hpp"
 #include "remote/zone.hpp"
 #include "base/configtype.hpp"
+#include "base/io-future.hpp"
 #include <set>
 
 using namespace icinga;
 
 REGISTER_URLHANDLER("/v1/objects", CreateObjectHandler);
 
-bool CreateObjectHandler::HandleRequest(
+static bool HandleRequestImpl(
 	const WaitGroup::Ptr& waitGroup,
 	const HttpRequest& request,
-	HttpResponse& response,
-	boost::asio::yield_context& yc
+	HttpResponse& response
 )
 {
 	namespace http = boost::beast::http;
@@ -162,3 +162,15 @@ bool CreateObjectHandler::HandleRequest(
 
 	return true;
 }
+
+bool CreateObjectHandler::HandleRequest(
+	const WaitGroup::Ptr& waitGroup,
+	const HttpRequest& request,
+	HttpResponse& response,
+	boost::asio::yield_context& yc
+)
+{
+	return QueueAsioFutureCallback([&](){
+		return HandleRequestImpl(waitGroup, request, response);
+	})->Get(yc);
+}