tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8512 from Icinga/bugfix/zombie-processes 

Revert "icinga2 daemon: reap remaining child processes after reload"
This commit is contained in:
Alexander Aleksandrovič Klimov 2021-01-11 11:38:20 +01:00 committed by GitHub
parent cb25be2d12 8c6bfdcf54
commit 862add5f3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/cli/daemoncommand.cpp
View File

@ -790,17 +790,6 @@ 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);