X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmetaproxy_prog.cpp;h=c1f612306c5335d61d4f8135b21c9133012c067e;hb=60d4816be16dc740e99f01ca4c6f2e086b6b5a78;hp=cdcd2446555dea59e4cc69e1c550b858be32b79f;hpb=993d2e36979a8cd82ce582205d3f9638b3daca46;p=metaproxy-moved-to-github.git

diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp
index cdcd244..c1f6123 100644
--- a/src/metaproxy_prog.cpp
+++ b/src/metaproxy_prog.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2008 Index Data
+   Copyright (C) 2005-2010 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
@@ -27,14 +27,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <stdexcept>
 #include <libxml/xinclude.h>
 
-#include "filter.hpp"
-#include "package.hpp"
+#include <metaproxy/filter.hpp>
+#include <metaproxy/package.hpp>
 #include "router_flexml.hpp"
 #include "factory_static.hpp"
 
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#include <signal.h>
 #ifdef WIN32
 #include <direct.h>
 #include <io.h>
@@ -43,12 +44,32 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 namespace mp = metaproxy_1;
 
+mp::RouterFleXML *routerp = 0;
+
+#if HAVE_UNISTD_H
+static pid_t process_group = 0;
+
+static void sig_term_handler(int s)
+{
+    kill(-process_group, SIGTERM); /* kill all children processes as well */
+    exit(0);
+}
+#endif
+
 static void handler(void *data)
 {
-    mp::RouterFleXML *routerp = (mp::RouterFleXML*) data;
+    routerp = (mp::RouterFleXML*) data;
+
+#if HAVE_UNISTD_H    
+    /* make the current working process group leader */
+    setpgid(0, 0);
+    process_group = getpgid(0); // save process group ID
+    
+    signal(SIGTERM, sig_term_handler);
+#endif
 
     mp::Package pack;
-    pack.router(*routerp).move();
+    pack.router(*routerp).move(); /* should never exit */
 }
     
 static int sc_main(
@@ -144,26 +165,42 @@ static int sc_main(
             return 1;
         }
         // and perform Xinclude then
-        if (xmlXIncludeProcess(doc) > 0) {
-            yaz_log (YLOG_LOG, "processing XInclude directive");
+        int r = xmlXIncludeProcess(doc);
+        if (r == -1)
+        {
+            yaz_log(YLOG_FATAL, "XInclude processing failed");
+            return 1;
         }
+        WRBUF base_path = wrbuf_alloc();
+        const char *last_p = strrchr(fname,
+#ifdef WIN32
+                                     '\\'
+#else
+                                     '/'
+#endif
+            );
+        if (last_p)
+            wrbuf_write(base_path, fname, last_p - fname);
+        
         mp::FactoryStatic factory;
-        mp::RouterFleXML router(doc, factory, false);
+        mp::RouterFleXML *router =
+            new mp::RouterFleXML(doc, factory, false, wrbuf_cstr(base_path));
+        wrbuf_destroy(base_path);
 
         yaz_sc_running(s);
 
-        yaz_daemon("metaproxy", mode, handler, &router, pidfile, uid);
+        yaz_daemon("metaproxy", mode, handler, router, pidfile, uid);
     }
     catch (std::logic_error &e) {
         yaz_log (YLOG_FATAL,"std::logic error: %s" , e.what() );
         return 1;
     }
     catch (std::runtime_error &e) {
-        yaz_log (YLOG_FATAL, "std::runtime error: %s" , e.what() );
+        yaz_log(YLOG_FATAL, "std::runtime error: %s" , e.what() );
         return 1;
     }
     catch ( ... ) {
-        yaz_log (YLOG_FATAL, "Unknown Exception");
+        yaz_log(YLOG_FATAL, "Unknown Exception");
         return 1;
     }
     return 0;