Postpone yaz_daemon_stop until out of router loop

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

diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp
index ecdee29..d082124 100644 (file)
--- a/src/metaproxy_prog.cpp
+++ b/src/metaproxy_prog.cpp
@@ -54,7 +54,6 @@ 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)
@@ -80,6 +79,7 @@ static void work_common(void *data)
     mp::Package pack;
     pack.router(*routerp).move();
     yaz_log(YLOG_LOG, "metaproxy stop"); /* only for graceful stop */
+    yaz_daemon_stop();
     _exit(0);
 }
 
@@ -185,12 +185,13 @@ static int sc_main(
         return 1;
     }
     
-    yaz_log(YLOG_LOG, "metaproxy start " VERSION
+    if (!test_config)
+        yaz_log(YLOG_LOG, "metaproxy start " VERSION
 #ifdef VERSION_SHA1
-            " " VERSION_SHA1
+                " " VERSION_SHA1
 #endif
-        );
-    
+            );
+
     yaz_log_xml_errors(0, YLOG_LOG);
     xmlDocPtr doc = xmlReadFile(fname,
                                 NULL,