X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fmetaproxy_prog.cpp;h=083ea29812f67a36dd240fc42105a6a0c27a1e15;hb=9838c2eadf06b6bfe3d6eb264c1b485b51ba1a06;hp=a4ec7f0792aaa2ae2c8268ee94fd853ad69c8d53;hpb=cec05aa8c24b33f36e6aa1c8a00d3ecb58dd5e84;p=metaproxy-moved-to-github.git

diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp
index a4ec7f0..083ea29 100644
--- a/src/metaproxy_prog.cpp
+++ b/src/metaproxy_prog.cpp
@@ -59,18 +59,20 @@ static void set_log_prefix(void)
 #if HAVE_UNISTD_H
 static pid_t process_group = 0;
 
-static void sig_usr1_handler(int s)
+static void sig_usr1_handler(int signo)
 {
     yaz_log(YLOG_LOG, "metaproxy received SIGUSR1");
-    routerp->stop();
+    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);
+    if (routerp)
+    {
+        yaz_log(YLOG_LOG, "metaproxy received SIGTERM");
+        routerp->stop(signo);
+    }
 }
 #endif
 
@@ -88,7 +90,9 @@ static void work_common(void *data)
 
     mp::Package pack;
     pack.router(*routerp).move();
-    yaz_log(YLOG_LOG, "metaproxy stop"); /* only for graceful stop */
+    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