From d3f6a97a7ede7c049a12b71a6ea473f2180252d6 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Wed, 14 Oct 2020 14:02:44 +0200 Subject: [PATCH] Ensure the daemon doesn't get killed by logrotate refs #8050 --- lib/cli/daemoncommand.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/cli/daemoncommand.cpp b/lib/cli/daemoncommand.cpp index 28fce401d..7f0c31b3f 100644 --- a/lib/cli/daemoncommand.cpp +++ b/lib/cli/daemoncommand.cpp @@ -367,6 +367,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 == l_UmbrellaPid) { // The umbrella process allowed us to continue working beyond config validation @@ -459,6 +463,7 @@ static pid_t StartUnixWorker(const std::vector& 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);