X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmetaproxy_prog.cpp;h=76113f329aeafc580f6ed2b2733a856fbae17f41;hb=609b34d0f6fd3268c4ec38713b0db99f0a362d40;hp=16512e7f621bb12f67d12bd5fd1639170af51450;hpb=8686feb1ea052b98b592e1d12ed4bb3ac2528c13;p=metaproxy-moved-to-github.git

diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp
index 16512e7..76113f3 100644
--- a/src/metaproxy_prog.cpp
+++ b/src/metaproxy_prog.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2011 Index Data
+   Copyright (C) 2005-2012 Index Data
 
 Metaproxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -29,6 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <metaproxy/filter.hpp>
 #include <metaproxy/package.hpp>
+#include <metaproxy/util.hpp>
 #include "router_flexml.hpp"
 #include "factory_static.hpp"
 
@@ -49,34 +50,51 @@ mp::RouterFleXML *routerp = 0;
 #if HAVE_UNISTD_H
 static pid_t process_group = 0;
 
+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)
 {
+    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);
 }
 #endif
 
-static void handler_debug(void *data)
+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
     routerp = (mp::RouterFleXML*) 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 */
+    _exit(0);
+}
+
+static void work_debug(void *data)
+{
+    work_common(data);
 }
     
-static void handler_normal(void *data)
+static void work_normal(void *data)
 {
 #if HAVE_UNISTD_H
     /* make the current working process group leader */
     setpgid(0, 0);
 #endif
-    handler_debug(data);
+    work_common(data);
 }
 
 static int sc_main(
@@ -167,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
@@ -180,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
@@ -190,7 +210,7 @@ static int sc_main(
         yaz_log(YLOG_FATAL, "XInclude processing failed");
         return 1;
     }
-    WRBUF base_path = wrbuf_alloc();
+    mp::wrbuf base_path;
     const char *last_p = strrchr(fname,
 #ifdef WIN32
                                  '\\'
@@ -213,11 +233,11 @@ static int sc_main(
             yaz_sc_running(s);
             
             yaz_daemon("metaproxy", mode, mode == YAZ_DAEMON_DEBUG ?
-                       handler_debug : handler_normal, router, pidfile, uid);
+                       work_debug : work_normal, router, pidfile, uid);
         }
     }
     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) {
@@ -228,7 +248,6 @@ static int sc_main(
         yaz_log(YLOG_FATAL, "Unknown Exception");
         ret = 1;
     }
-    wrbuf_destroy(base_path);
     xmlFreeDoc(doc);
     return ret;
 }
@@ -249,8 +268,6 @@ int main(int argc, char **argv)
     exit(ret);
 }
 
-
-
 /*
  * Local variables:
  * c-basic-offset: 4