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 #8166 from Icinga/bugfix/logrotate-crash-8050 

Ensure the daemon doesn't get killed by logrotate
This commit is contained in:
Alexander Aleksandrovič Klimov 2020-10-15 10:39:47 +02:00 committed by GitHub
parent a54bd52d5c d3f6a97a7e
commit 1f55338cbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/cli/daemoncommand.cpp
View File

@ -397,6 +397,10 @@ static void UmbrellaSignalHandler(int num, siginfo_t *info, void*)
static void WorkerSignalHandler(int num, siginfo_t *info, void*)
{
switch (num) {
case SIGUSR1:
// Catches SIGUSR1 as long as the actual handler (logrotate)
// has not been installed not to let SIGUSR1 terminate the process
break;
case SIGUSR2:
if (info->si_pid == 0 || info->si_pid == l_UmbrellaPid) {
// The umbrella process allowed us to continue working beyond config validation
@ -489,6 +493,7 @@ static pid_t StartUnixWorker(const std::vector<std::string>& configs, bool close
sa.sa_sigaction = &WorkerSignalHandler;
sa.sa_flags = SA_RESTART | SA_SIGINFO;
(void)sigaction(SIGUSR1, &sa, nullptr);
(void)sigaction(SIGUSR2, &sa, nullptr);
(void)sigaction(SIGINT, &sa, nullptr);
(void)sigaction(SIGTERM, &sa, nullptr);