From 91265a5b0e134006893576a465c4c84906f1eb82 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Wed, 14 Oct 2020 18:00:16 +0200
Subject: [PATCH] icinga2 daemon: reap remaining child processes after reload

... as we may be PID 1.
---
 lib/cli/daemoncommand.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lib/cli/daemoncommand.cpp b/lib/cli/daemoncommand.cpp
index 28fce401d..4c33c6dfc 100644
--- a/lib/cli/daemoncommand.cpp
+++ b/lib/cli/daemoncommand.cpp
@@ -746,6 +746,17 @@ int DaemonCommand::Run(const po::variables_map& vm, const std::vector<std::strin
 						<< "Waited for " << Utility::FormatDuration(Utility::GetTime() - start) << " on old process to exit.";
 				}
 
+				for (int info;;) {
+					auto pid (waitpid(-1, &info, WNOHANG));
+
+					if (pid < 1) {
+						break;
+					}
+
+					Log(LogNotice, "cli")
+						<< "Reaped child process " << pid << ".";
+				}
+
 				// Old instance shut down, allow the new one to continue working beyond config validation
 				(void)kill(nextWorker, SIGUSR2);