From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 9 May 2012 10:58:36 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
X-Git-Tag: v1.3.35~4
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=1158dc8bbcb0bd5d161333380fe91e93185674a6;hp=9401913fbcdbead99f1180848f5fef0d02fd871e;p=metaproxy-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy

Conflicts:
	src/metaproxy_prog.cpp
---

diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp
index 0deb96e..6ecc5f0 100644
--- a/src/metaproxy_prog.cpp
+++ b/src/metaproxy_prog.cpp
@@ -54,6 +54,7 @@ static void sig_usr1_handler(int s)
 {
     yaz_log(YLOG_LOG, "metaproxy received SIGUSR1");
     routerp->stop();
+    yaz_daemon_stop();
 }
 
 static void sig_term_handler(int s)
@@ -69,7 +70,7 @@ 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);
 #endif
@@ -78,11 +79,7 @@ static void work_common(void *data)
 
     mp::Package pack;
     pack.router(*routerp).move();
-    /* this only exits if graceful stop is received (sig_usr1_handler) */
-    yaz_log(YLOG_LOG, "metaproxy stop");
-#if HAVE_UNISTD_H
-    kill(-process_group, SIGTERM); /* kill all children processes as well */
-#endif
+    yaz_log(YLOG_LOG, "metaproxy stop"); /* only for graceful stop */
     _exit(0);
 }