X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmetaproxy_prog.cpp;h=dfcea2964fa2b6ee300ec016160e6dd2f6e4aa39;hb=586d78659d671683f33ec55f4a7d32b28e345ccd;hp=5a50f44bf5974c8a6590b2390c5866f518d766ad;hpb=73f37c91c144b070020df2f27472c09b62367acf;p=metaproxy-moved-to-github.git

diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp
index 5a50f44..dfcea29 100644
--- a/src/metaproxy_prog.cpp
+++ b/src/metaproxy_prog.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2012 Index Data
+   Copyright (C) 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
@@ -23,6 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/daemon.h>
 
 #include <yaz/sc.h>
+#include <yaz/backtrace.h>
 #include <iostream>
 #include <stdexcept>
 #include <libxml/xinclude.h>
@@ -30,8 +31,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"
+#include <metaproxy/router_xml.hpp>
 
 #if HAVE_UNISTD_H
 #include <unistd.h>
@@ -45,41 +45,56 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 namespace mp = metaproxy_1;
 
-mp::RouterFleXML *routerp = 0;
+mp::RouterXML *routerp = 0;
 
+static void set_log_prefix(void)
+{
 #if HAVE_UNISTD_H
-static pid_t process_group = 0;
+    char str[80];
 
-static void sig_usr1_handler(int s)
-{
-    yaz_log(YLOG_LOG, "metaproxy received SIGUSR1");
-    routerp->stop();
+    sprintf(str, "%lld", (long long) getpid());
+    yaz_log_init_prefix(str);
+#endif
 }
 
-static void sig_term_handler(int s)
+#if HAVE_UNISTD_H
+static pid_t process_group = 0;
+static int sig_received = 0;
+static pid_t my_pid = 0;
+
+static void sig_x_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 (sig_received)
+        return;
+    if ( getpid() != my_pid ) // can happen in unlikely cases
+        return; // when the sig hits a child just after fork(), before it
+                // clears its sighandler. MP-559.
+    sig_received = signo;
+    if (routerp)
+        routerp->stop(signo);
+    if (signo == SIGTERM)
+        kill(-process_group, SIGTERM); /* kill all children processes as well */
 }
 #endif
 
 static void work_common(void *data)
 {
+    set_log_prefix();
 #if HAVE_UNISTD_H
     process_group = getpgid(0); // save process group ID
+    my_pid = getpid();
 
-    signal(SIGTERM, sig_term_handler);
-    signal(SIGUSR1, sig_usr1_handler);
+    signal(SIGTERM, sig_x_handler);
+    signal(SIGUSR1, sig_x_handler);
 #endif
-    routerp = (mp::RouterFleXML*) data;
+    routerp = (mp::RouterXML*) data;
     routerp->start();
 
     mp::Package pack;
     pack.router(*routerp).move();
-    yaz_log(YLOG_LOG, "metaproxy stop"); /* only for graceful stop */
-    yaz_daemon_stop();
+    yaz_log(YLOG_LOG, "metaproxy stop");
+    delete routerp;
+    routerp = 0;
     _exit(0);
 }
 
@@ -109,7 +124,10 @@ static int sc_main(
     const char *pidfile = 0;
     const char *uid = 0;
 
-    while ((ret = options("c{config}:Dh{help}l:p:tu:V{version}w:X",
+    yaz_enable_panic_backtrace(argv[0]);
+    set_log_prefix();
+
+    while ((ret = options("c{config}:Dh{help}l:m:p:tu:v:V{version}w:X",
                           argv, argc, &arg)) != -2)
     {
         switch (ret)
@@ -124,9 +142,11 @@ static int sc_main(
             std::cerr << "metaproxy\n"
                 " -h|--help     help\n"
                 " -V|--version  version\n"
+                " -v level\n"
                 " -c|--config f config filename\n"
                 " -D            daemon and keepalive operation\n"
                 " -l f          log file f\n"
+                " -m logformat  log time format (strftime)\n"
                 " -p f          pid file f\n"
                 " -t            test configuration\n"
                 " -u id         change uid to id\n"
@@ -142,6 +162,9 @@ static int sc_main(
         case 'l':
             yaz_log_init_file(arg);
             break;
+        case 'm':
+            yaz_log_time_format(arg);
+            break;
         case 'p':
             pidfile = arg;
             break;
@@ -151,6 +174,9 @@ static int sc_main(
         case 'u':
             uid = arg;
             break;
+        case 'v':
+            yaz_log_init_level(yaz_log_mask_str(arg));
+            break;
         case 'V':
             std::cout << VERSION;
 #ifdef VERSION_SHA1
@@ -185,13 +211,16 @@ static int sc_main(
         return 1;
     }
 
-    if (!test_config)
-        yaz_log(YLOG_LOG, "metaproxy start " VERSION
+    yaz_log(YLOG_LOG, "metaproxy %s " VERSION
 #ifdef VERSION_SHA1
                 " " VERSION_SHA1
 #endif
+        , test_config ? "test" : "start"
             );
 
+    xmlInitParser();
+    LIBXML_TEST_VERSION
+
     yaz_log_xml_errors(0, YLOG_LOG);
     xmlDocPtr doc = xmlReadFile(fname,
                                 NULL,
@@ -224,9 +253,8 @@ static int sc_main(
         wrbuf_puts(base_path, ".");
     ret = 0;
     try {
-        mp::FactoryStatic factory;
-        mp::RouterFleXML *router =
-            new mp::RouterFleXML(doc, factory, test_config, wrbuf_cstr(base_path));
+        mp::RouterXML *router =
+            new mp::RouterXML(doc, test_config, wrbuf_cstr(base_path));
         if (!test_config)
         {
 
@@ -235,6 +263,7 @@ static int sc_main(
             yaz_daemon("metaproxy", mode, mode == YAZ_DAEMON_DEBUG ?
                        work_debug : work_normal, router, pidfile, uid);
         }
+        delete router;
     }
     catch (std::logic_error &e) {
         yaz_log(YLOG_FATAL,"std::logic error: %s" , e.what() );
@@ -249,6 +278,8 @@ static int sc_main(
         ret = 1;
     }
     xmlFreeDoc(doc);
+    if (test_config)
+        yaz_log(YLOG_LOG, "metaproxy test exit code %d", ret);
     return ret;
 }