]> git.ipfire.org Git - thirdparty/rspamd.git/commitdiff
Improve signals output
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Wed, 14 Oct 2015 15:17:42 +0000 (16:17 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Wed, 14 Oct 2015 15:17:42 +0000 (16:17 +0100)
src/libserver/worker_util.c
src/rspamd.c

index 47d85d6bcec5e7ce8fb91a260d38f2dd76597ccf..5aff8883b90114e18e4f5908e7a0ff45adf6514f 100644 (file)
@@ -112,8 +112,8 @@ rspamd_worker_term_handler (struct rspamd_worker_signal_handler *sigh, void *arg
                                sigh->worker->srv->server_pool->tag.tagname,
                                sigh->worker->srv->server_pool->tag.uid,
                                G_STRFUNC,
-                               "terminating after receiving %s signal",
-                               strsignal (sigh->signo));
+                               "terminating after receiving signal %s",
+                               g_strsignal (sigh->signo));
                wanna_die = 1;
                tv.tv_sec = 0;
                tv.tv_usec = 0;
index 38d99828958656643437075334643a9e54ded0b8..f6c682be6ed19994f197b5c747905b202da82616 100644 (file)
@@ -645,7 +645,7 @@ rspamd_term_handler (gint signo, short what, gpointer arg)
        struct rspamd_main *rspamd_main = arg;
 
        msg_info_main ("catch termination signal, waiting for children");
-       rspamd_pass_signal (rspamd_main->workers, SIGTERM);
+       rspamd_pass_signal (rspamd_main->workers, signo);
 
        event_base_loopexit (rspamd_main->ev_base, NULL);
 }