Merge branch 'bugfix/latency-8196' into feature/procspawn-concurrency

Icinga · Sep 24, 2020 · 105d09c · 105d09c
2 parents c53b9ae + 177f930
commit 105d09c
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/lib/cli/daemoncommand.cpp b/lib/cli/daemoncommand.cpp
@@ -11,6 +11,7 @@
 #include "base/defer.hpp"
 #include "base/logger.hpp"
 #include "base/application.hpp"
+#include "base/process.hpp"
 #include "base/timer.hpp"
 #include "base/utility.hpp"
 #include "base/exception.hpp"
@@ -504,6 +505,14 @@ static pid_t StartUnixWorker(const std::vector<std::string>& configs, bool close
 					_exit(EXIT_FAILURE);
 				}
 
+				try {
+					Process::InitializeSpawnHelper();
+				} catch (const std::exception& ex) {
+					Log(LogCritical, "cli")
+						<< "Failed to initialize process spawn helper after forking (child): " << DiagnosticInformation(ex);
+					_exit(EXIT_FAILURE);
+				}
+
 				_exit(RunWorker(configs, closeConsoleLog, stderrFile));
 			} catch (...) {
 				_exit(EXIT_FAILURE);