X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;ds=sidebyside;f=src%2Fmetaproxy_prog.cpp;h=2ee1afd76d188ff1b530cac40f72433e2aefc94f;hb=638d2456bbbba9cb8f31fbbb6ca39ad090e3c223;hp=58629d3bd964653bf70fc0185bfbade0fc82733e;hpb=15e63ff49000e082d8387c243941485ccacff13b;p=metaproxy-moved-to-github.git

diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp
index 58629d3..2ee1afd 100644
--- a/src/metaproxy_prog.cpp
+++ b/src/metaproxy_prog.cpp
@@ -59,21 +59,20 @@ static void set_log_prefix(void)
 #if HAVE_UNISTD_H
 static pid_t process_group = 0;
 static int sig_received = 0;
+static pid_t my_pid = 0;  
 
-static void sig_usr1_handler(int signo)
+static void sig_x_handler(int signo)
 {
+    if (sig_received)
+        return;
+    if ( getpid() != my_pid ) // can happen in unlikely cases
+        return; // when the sig hits a child just after fork(), before it
+                // clears its sighandler. MP-559.
     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
 
@@ -82,36 +81,19 @@ static void work_common(void *data)
     set_log_prefix();
 #if HAVE_UNISTD_H
     process_group = getpgid(0); // save process group ID
-
-    signal(SIGTERM, sig_term_handler);
-    signal(SIGUSR1, sig_usr1_handler);
+    my_pid = getpid(); 
+    
+    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)
-    {
-    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
     _exit(0);
 }