Don't call filter destructors on SIGTERM CP-3770

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

diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp
index 58629d3..167a58a 100644 (file)
--- a/src/metaproxy_prog.cpp
+++ b/src/metaproxy_prog.cpp
@@ -60,20 +60,15 @@ static void set_log_prefix(void)
 static pid_t process_group = 0;
 static int sig_received = 0;
 
-static void sig_usr1_handler(int signo)
+static void sig_x_handler(int signo)
 {
+    if (sig_received)
+        return;
     sig_received = signo;
     if (routerp)
         routerp->stop(signo);
-}
-
-static void sig_term_handler(int signo)
-{
-    sig_received = signo;
-    if (routerp)
-    {
-        routerp->stop(signo);
-    }
+    if (signo == SIGTERM)
+        kill(-process_group, SIGTERM); /* kill all children processes as well */
 }
 #endif
 
@@ -83,35 +78,21 @@ static void work_common(void *data)
 #if HAVE_UNISTD_H
     process_group = getpgid(0); // save process group ID
 
-    signal(SIGTERM, sig_term_handler);
-    signal(SIGUSR1, sig_usr1_handler);
+    signal(SIGTERM, sig_x_handler);
+    signal(SIGUSR1, sig_x_handler);
 #endif
     routerp = (mp::RouterXML*) data;
     routerp->start();
 
     mp::Package pack;
     pack.router(*routerp).move();
-#if HAVE_UNISTD_H
-    switch (sig_received)
+    yaz_log(YLOG_LOG, "metaproxy stop");
+
+    if (sig_received != SIGTERM)
     {
-    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);
+        delete routerp;
+        routerp = 0;
     }
-#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
     _exit(0);
 }