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

diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp
index fa0ea33..dfcea29 100644
--- a/src/metaproxy_prog.cpp
+++ b/src/metaproxy_prog.cpp
@@ -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>
@@ -59,11 +60,15 @@ static void set_log_prefix(void)
 #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)
 {
     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);
@@ -77,6 +82,7 @@ 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_x_handler);
     signal(SIGUSR1, sig_x_handler);
@@ -118,6 +124,7 @@ static int sc_main(
     const char *pidfile = 0;
     const char *uid = 0;
 
+    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",
@@ -211,6 +218,9 @@ static int sc_main(
         , test_config ? "test" : "start"
             );
 
+    xmlInitParser();
+    LIBXML_TEST_VERSION
+
     yaz_log_xml_errors(0, YLOG_LOG);
     xmlDocPtr doc = xmlReadFile(fname,
                                 NULL,
@@ -253,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() );