Avoid yaz_log calls in signal handlers MP-513

[metaproxy-moved-to-github.git] / src / metaproxy_prog.cpp

diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp
index a4ec7f0..58629d3 100644 (file)
--- a/src/metaproxy_prog.cpp
+++ b/src/metaproxy_prog.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2013 Index Data
+   Copyright (C) Index Data
 
 Metaproxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -58,19 +58,22 @@ static void set_log_prefix(void)
 
 #if HAVE_UNISTD_H
 static pid_t process_group = 0;
+static int sig_received = 0;
 
-static void sig_usr1_handler(int s)
+static void sig_usr1_handler(int signo)
 {
-    yaz_log(YLOG_LOG, "metaproxy received SIGUSR1");
-    routerp->stop();
+    sig_received = signo;
+    if (routerp)
+        routerp->stop(signo);
 }
 
-static void sig_term_handler(int s)
+static void sig_term_handler(int signo)
 {
-    yaz_log(YLOG_LOG, "metaproxy received SIGTERM");
-    yaz_log(YLOG_LOG, "metaproxy stop");
-    kill(-process_group, SIGTERM); /* kill all children processes as well */
-    _exit(0);
+    sig_received = signo;
+    if (routerp)
+    {
+        routerp->stop(signo);
+    }
 }
 #endif
 
@@ -88,7 +91,24 @@ static void work_common(void *data)
 
     mp::Package pack;
     pack.router(*routerp).move();
-    yaz_log(YLOG_LOG, "metaproxy stop"); /* only for graceful stop */
+#if HAVE_UNISTD_H
+    switch (sig_received)
+    {
+    case SIGTERM:
+        yaz_log(YLOG_LOG, "metaproxy received SIGTERM");
+        break;
+    case SIGUSR1:
+        yaz_log(YLOG_LOG, "metaproxy received SIGUSR1");
+        break;
+    case 0:
+        break;
+    default:
+        yaz_log(YLOG_LOG, "metaproxy received signo=%d", sig_received);
+    }
+#endif
+    yaz_log(YLOG_LOG, "metaproxy stop");
+    delete routerp;
+    routerp = 0;
 #if HAVE_UNISTD_H
     kill(-process_group, SIGTERM); /* kill all children processes as well */
 #endif