ApiListener::ConfigUpdateHandler(): block as less as possible

refs #7742
Icinga · Jul 7, 2020 · 4d80903 · 4d80903
1 parent 6a19931
commit 4d80903
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/remote/apilistener-filesync.cpp b/lib/remote/apilistener-filesync.cpp
@@ -13,6 +13,7 @@
 #include "base/utility.hpp"
 #include <fstream>
 #include <iomanip>
+#include <thread>
 
 using namespace icinga;
 
@@ -310,6 +311,12 @@ Value ApiListener::ConfigUpdateHandler(const MessageOrigin::Ptr& origin, const D
 		return Empty;
 	}
 
+	std::thread([origin, params]() { HandleConfigUpdate(origin, params); }).detach();
+	return Empty;
+}
+
+void ApiListener::HandleConfigUpdate(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params)
+{
 	/* Only one transaction is allowed, concurrent message handlers need to wait.
 	 * This affects two parent endpoints sending the config in the same moment.
 	 */
@@ -527,8 +534,6 @@ Value ApiListener::ConfigUpdateHandler(const MessageOrigin::Ptr& origin, const D
 			<< "Received configuration updates (" << count << ") from endpoint '" << fromEndpointName
 			<< "' do not qualify for production, not triggering reload.";
 	}
-
-	return Empty;
 }
 
 /**

diff --git a/lib/remote/apilistener.hpp b/lib/remote/apilistener.hpp
@@ -83,6 +83,7 @@ class ApiListener final : public ObjectImpl<ApiListener>
 
 	/* filesync */
 	static Value ConfigUpdateHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params);
+	static void HandleConfigUpdate(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params);
 
 	/* configsync */
 	static void ConfigUpdateObjectHandler(const ConfigObject::Ptr& object, const Value& cookie);