Forward SIGUSR1

refs #5230

diff --git a/lib/cli/daemoncommand.cpp b/lib/cli/daemoncommand.cpp
index 39fd804be7cb77dafde40c5ec8ab8786c7c45ade..3dd8a81773f15c54e2d14ecc8aef2f52fef6b90a 100644 (file)
--- a/lib/cli/daemoncommand.cpp
+++ b/lib/cli/daemoncommand.cpp
@@ -260,6 +260,7 @@ static const sigset_t l_UnixWorkerSignals = ([]() -> sigset_t {
 
        (void)sigemptyset(&s);
        (void)sigaddset(&s, SIGCHLD);
+       (void)sigaddset(&s, SIGUSR1);
        (void)sigaddset(&s, SIGUSR2);
        (void)sigaddset(&s, SIGINT);
        (void)sigaddset(&s, SIGTERM);
@@ -272,10 +273,14 @@ static std::atomic<pid_t> l_CurrentlyStartingUnixWorkerPid (-1);
 static std::atomic<UnixWorkerState> l_CurrentlyStartingUnixWorkerState (UnixWorkerState::Pending);
 static std::atomic<int> l_TermSignal (-1);
 static std::atomic<bool> l_RequestedReload (false);
+static std::atomic<bool> l_RequestedReopenLogs (false);
 
 static void UmbrellaSignalHandler(int num, siginfo_t *info, void*)
 {
        switch (num) {
+               case SIGUSR1:
+                       l_RequestedReopenLogs.store(true);
+                       break;
                case SIGUSR2:
                        if (l_CurrentlyStartingUnixWorkerState.load() == UnixWorkerState::Pending
                                && info->si_pid == l_CurrentlyStartingUnixWorkerPid.load()) {
@@ -373,6 +378,7 @@ static pid_t StartUnixWorker(const std::vector<std::string>& configs)
                                        sa.sa_handler = SIG_DFL;
 
                                        (void)sigaction(SIGCHLD, &sa, nullptr);
+                                       (void)sigaction(SIGUSR1, &sa, nullptr);
                                        (void)sigaction(SIGHUP, &sa, nullptr);
                                }
 
@@ -556,6 +562,7 @@ int DaemonCommand::Run(const po::variables_map& vm, const std::vector<std::strin
                sa.sa_flags = SA_NOCLDSTOP | SA_RESTART | SA_SIGINFO;
 
                (void)sigaction(SIGCHLD, &sa, nullptr);
+               (void)sigaction(SIGUSR1, &sa, nullptr);
                (void)sigaction(SIGUSR2, &sa, nullptr);
                (void)sigaction(SIGINT, &sa, nullptr);
                (void)sigaction(SIGTERM, &sa, nullptr);
@@ -638,6 +645,12 @@ int DaemonCommand::Run(const po::variables_map& vm, const std::vector<std::strin
 
                }
 
+               if (l_RequestedReopenLogs.exchange(false)) {
+                       Log(LogNotice, "cli") << "Got signal " << SIGUSR1 << ", forwarding to seemless worker (PID " << currentWorker << ")";
+
+                       (void)kill(currentWorker, SIGUSR1);
+               }
+
                {
                        int status;
                        if (waitpid(currentWorker, &status, WNOHANG) > 0) {