X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fmetaproxy_prog.cpp;h=c470b906b7e89bc8bdfd412781fae0fb044a79fb;hb=86ca80da550dc8b26d253b74f43d8ff376216ab2;hp=2ee1afd76d188ff1b530cac40f72433e2aefc94f;hpb=638d2456bbbba9cb8f31fbbb6ca39ad090e3c223;p=metaproxy-moved-to-github.git

diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp
index 2ee1afd..c470b90 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,7 +60,7 @@ 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 pid_t my_pid = 0;
 
 static void sig_x_handler(int signo)
 {
@@ -81,8 +82,8 @@ static void work_common(void *data)
     set_log_prefix();
 #if HAVE_UNISTD_H
     process_group = getpgid(0); // save process group ID
-    my_pid = getpid(); 
-    
+    my_pid = getpid();
+
     signal(SIGTERM, sig_x_handler);
     signal(SIGUSR1, sig_x_handler);
 #endif
@@ -123,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",
@@ -216,6 +218,14 @@ static int sc_main(
         , test_config ? "test" : "start"
             );
 
+    char yaz_version_str[20];
+    char yaz_sha1_str[41];
+    yaz_version(yaz_version_str, yaz_sha1_str);
+    yaz_log(YLOG_LOG, "YAZ %s %s", yaz_version_str, yaz_sha1_str);
+
+    xmlInitParser();
+    LIBXML_TEST_VERSION
+
     yaz_log_xml_errors(0, YLOG_LOG);
     xmlDocPtr doc = xmlReadFile(fname,
                                 NULL,
@@ -255,9 +265,11 @@ static int sc_main(
 
             yaz_sc_running(s);
 
-            yaz_daemon("metaproxy", mode, mode == YAZ_DAEMON_DEBUG ?
-                       work_debug : work_normal, router, pidfile, uid);
+            yaz_daemon("metaproxy", mode | YAZ_DAEMON_LOG_REOPEN,
+                       (mode & YAZ_DAEMON_FORK) ? work_normal : work_debug,
+                       router, pidfile, uid);
         }
+        delete router;
     }
     catch (std::logic_error &e) {
         yaz_log(YLOG_FATAL,"std::logic error: %s" , e.what() );