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 7183419..d082124 100644 (file)
--- a/src/metaproxy_prog.cpp
+++ b/src/metaproxy_prog.cpp
@@ -52,11 +52,14 @@ static pid_t process_group = 0;
 
 static void sig_usr1_handler(int s)
 {
+    yaz_log(YLOG_LOG, "metaproxy received SIGUSR1");
     routerp->stop();
 }
 
 static void sig_term_handler(int s)
 {
+    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);
 }
@@ -66,7 +69,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
@@ -74,7 +77,9 @@ static void work_common(void *data)
     routerp->start();
 
     mp::Package pack;
-    pack.router(*routerp).move(); /* should never exit */
+    pack.router(*routerp).move();
+    yaz_log(YLOG_LOG, "metaproxy stop"); /* only for graceful stop */
+    yaz_daemon_stop();
     _exit(0);
 }
 
@@ -180,12 +185,14 @@ 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, 
                                 XML_PARSE_XINCLUDE + XML_PARSE_NOBLANKS
@@ -193,7 +200,7 @@ static int sc_main(
     
     if (!doc)
     {
-        yaz_log (YLOG_FATAL,"XML parsing failed");
+        yaz_log(YLOG_FATAL,"XML parsing failed");
         return 1;
     }
     // and perform Xinclude then
@@ -230,7 +237,7 @@ static int sc_main(
         }
     }
     catch (std::logic_error &e) {
-        yaz_log (YLOG_FATAL,"std::logic error: %s" , e.what() );
+        yaz_log(YLOG_FATAL,"std::logic error: %s" , e.what() );
         ret = 1;
     }
     catch (std::runtime_error &e) {
@@ -261,8 +268,6 @@ int main(int argc, char **argv)
     exit(ret);
 }
 
-
-
 /*
  * Local variables:
  * c-basic-offset: 4