X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fmetaproxy_prog.cpp;h=c6d582fe434ef9580b6f8f1c4c0842fed7c758bb;hb=8ced8e7b5de3ecba12ac68ce5c5e8cddf40d800f;hp=7e25307ae8e5ba4a3741927cc0025ddc2e20a4a1;hpb=d0199347137c1614ee18af04fb1e52ff4a613cba;p=metaproxy-moved-to-github.git

diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp
index 7e25307..c6d582f 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) 2005-2013 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
@@ -47,6 +47,16 @@ namespace mp = metaproxy_1;
 
 mp::RouterFleXML *routerp = 0;
 
+static void set_log_prefix(void)
+{
+#if HAVE_UNISTD_H
+    char str[80];
+
+    sprintf(str, "%lld", (long long) getpid());
+    yaz_log_init_prefix(str);
+#endif
+}
+
 #if HAVE_UNISTD_H
 static pid_t process_group = 0;
 
@@ -54,7 +64,6 @@ 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)
@@ -68,6 +77,7 @@ static void sig_term_handler(int s)
 
 static void work_common(void *data)
 {
+    set_log_prefix();
 #if HAVE_UNISTD_H
     process_group = getpgid(0); // save process group ID
 
@@ -80,6 +90,9 @@ static void work_common(void *data)
     mp::Package pack;
     pack.router(*routerp).move();
     yaz_log(YLOG_LOG, "metaproxy stop"); /* only for graceful stop */
+#if HAVE_UNISTD_H
+    kill(-process_group, SIGTERM); /* kill all children processes as well */
+#endif
     _exit(0);
 }
 
@@ -87,7 +100,7 @@ static void work_debug(void *data)
 {
     work_common(data);
 }
-    
+
 static void work_normal(void *data)
 {
 #if HAVE_UNISTD_H
@@ -108,8 +121,10 @@ static int sc_main(
     unsigned mode = 0;
     const char *pidfile = 0;
     const char *uid = 0;
-    
-    while ((ret = options("c{config}:Dh{help}l:p:tu:V{version}w:X", 
+
+    set_log_prefix();
+
+    while ((ret = options("c{config}:Dh{help}l:p:tu:V{version}w:X",
                           argv, argc, &arg)) != -2)
     {
         switch (ret)
@@ -136,7 +151,7 @@ static int sc_main(
                 " -install      install windows service\n"
                 " -remove       remove windows service\n"
 #endif
-                
+
                       << std::endl;
             break;
         case 'l':
@@ -166,7 +181,7 @@ static int sc_main(
 #else
                 chdir(arg)
 #endif
-                ) 
+                )
             {
                 std::cerr << "chdir " << arg << " failed" << std::endl;
                 return 1;
@@ -184,22 +199,23 @@ static int sc_main(
         std::cerr << "No configuration given; use -h for help\n";
         return 1;
     }
-    
-    yaz_log(YLOG_LOG, "metaproxy start " VERSION
+
+    yaz_log(YLOG_LOG, "metaproxy %s " VERSION
 #ifdef VERSION_SHA1
-            " " VERSION_SHA1
+                " " VERSION_SHA1
 #endif
-        );
-    
+        , test_config ? "test" : "start"
+            );
+
     yaz_log_xml_errors(0, YLOG_LOG);
     xmlDocPtr doc = xmlReadFile(fname,
-                                NULL, 
+                                NULL,
                                 XML_PARSE_XINCLUDE + XML_PARSE_NOBLANKS
                                 + XML_PARSE_NSCLEAN + XML_PARSE_NONET );
-    
+
     if (!doc)
     {
-        yaz_log (YLOG_FATAL,"XML parsing failed");
+        yaz_log(YLOG_FATAL,"XML parsing failed");
         return 1;
     }
     // and perform Xinclude then
@@ -228,15 +244,15 @@ static int sc_main(
             new mp::RouterFleXML(doc, factory, test_config, wrbuf_cstr(base_path));
         if (!test_config)
         {
-            
+
             yaz_sc_running(s);
-            
+
             yaz_daemon("metaproxy", mode, mode == YAZ_DAEMON_DEBUG ?
                        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) {
@@ -248,6 +264,8 @@ static int sc_main(
         ret = 1;
     }
     xmlFreeDoc(doc);
+    if (test_config)
+        yaz_log(YLOG_LOG, "metaproxy test exit code %d", ret);
     return ret;
 }
 
@@ -267,8 +285,6 @@ int main(int argc, char **argv)
     exit(ret);
 }
 
-
-
 /*
  * Local variables:
  * c-basic-offset: 4