X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fmetaproxy_prog.cpp;h=2719870ab5609062d99101f703f0f527e642321b;hb=c1d953eee6c00432493bc364da6284704ccd9cc2;hp=5ef52a4d81ee87a44c6d1de5bb34b4ea238f67e0;hpb=665559cbc22546e8df69be33a7d492294cab9fb1;p=metaproxy-moved-to-github.git

diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp
index 5ef52a4..2719870 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-2011 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
@@ -22,33 +22,66 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/options.h>
 #include <yaz/daemon.h>
 
+#include <yaz/sc.h>
 #include <iostream>
 #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>
+#include <process.h>
 #endif
 
 namespace mp = metaproxy_1;
 
-static void handler(void *data)
+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_debug(void *data)
 {
-    mp::RouterFleXML *routerp = (mp::RouterFleXML*) data;
+#if HAVE_UNISTD_H
+    process_group = getpgid(0); // save process group ID
+    
+    signal(SIGTERM, sig_term_handler);
+#endif
+    routerp = (mp::RouterFleXML*) data;
+    routerp->start();
 
     mp::Package pack;
-    pack.router(*routerp).move();
+    pack.router(*routerp).move(); /* should never exit */
 }
     
-int main(int argc, char **argv)
+static void handler_normal(void *data)
+{
+#if HAVE_UNISTD_H
+    /* make the current working process group leader */
+    setpgid(0, 0);
+#endif
+    handler_debug(data);
+}
+
+static int sc_main(
+    yaz_sc_t s,
+    int argc, char **argv)
 {
     try 
     {
@@ -81,6 +114,11 @@ int main(int argc, char **argv)
                     " -u id         change uid to id\n"
                     " -w dir        changes working directory to dir\n"
                     " -X            debug mode (no fork/daemon mode)\n"
+#ifdef WIN32
+                    " -install      install windows service\n"
+                    " -remove       remove windows service\n"
+#endif
+
                           << std::endl;
                 break;
             case 'l':
@@ -93,30 +131,45 @@ int main(int argc, char **argv)
                 uid = arg;
                 break;
             case 'V':
-                std::cout << VERSION "\n";
-                std::exit(0);
+                std::cout << VERSION;
+#ifdef VERSION_SHA1
+                std::cout << " " VERSION_SHA1;
+#endif
+                std::cout << "\n";
+                return 0;
                 break;
             case 'w':
-                if (chdir(arg)) 
+                if (
+#ifdef WIN32
+                    _chdir(arg)
+#else
+                    chdir(arg)
+#endif
+                   ) 
                 {
                     std::cerr << "chdir " << arg << " failed" << std::endl;
-                    std::exit(1);
+                    return 1;
                 }
             case 'X':
                 mode = YAZ_DAEMON_DEBUG;
                 break;
             case -1:
                 std::cerr << "bad option: " << arg << std::endl;
-                std::exit(1);
+                return 1;
             }
         }
         if (!fname)
         {
             std::cerr << "No configuration given; use -h for help\n";
-            std::exit(1);
+            return 1;
         }
 
-        yaz_log(YLOG_LOG, "Metaproxy " VERSION " started");
+        yaz_log(YLOG_LOG, "Metaproxy start " VERSION
+#ifdef VERSION_SHA1
+                " " VERSION_SHA1
+#endif
+            );
+        
         xmlDocPtr doc = xmlReadFile(fname,
                                     NULL, 
                                     XML_PARSE_XINCLUDE + XML_PARSE_NOBLANKS
@@ -124,33 +177,69 @@ int main(int argc, char **argv)
         
         if (!doc)
         {
-            std::cerr << "XML parsing failed\n";
-            std::exit(1);
+            yaz_log (YLOG_FATAL,"XML parsing failed");
+            return 1;
         }
         // and perform Xinclude then
-        if (xmlXIncludeProcess(doc) > 0) {
-            std::cerr << "processing XInclude directive\n";
+        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_daemon("metaproxy", mode, handler, &router, pidfile, uid);
+        yaz_sc_running(s);
+
+        yaz_daemon("metaproxy", mode, mode == YAZ_DAEMON_DEBUG ?
+                   handler_debug : handler_normal, router, pidfile, uid);
     }
     catch (std::logic_error &e) {
-        std::cerr << "std::logic error: " << e.what() << "\n";
-        std::exit(1);
+        yaz_log (YLOG_FATAL,"std::logic error: %s" , e.what() );
+        return 1;
     }
     catch (std::runtime_error &e) {
-        std::cerr << "std::runtime error: " << e.what() << "\n";
-        std::exit(1);
+        yaz_log(YLOG_FATAL, "std::runtime error: %s" , e.what() );
+        return 1;
     }
     catch ( ... ) {
-        std::cerr << "Unknown Exception" << std::endl;
-        std::exit(1);
+        yaz_log(YLOG_FATAL, "Unknown Exception");
+        return 1;
     }
-    std::exit(0);
+    return 0;
 }
 
+static void sc_stop(yaz_sc_t s)
+{
+    return;
+}
+
+int main(int argc, char **argv)
+{
+    int ret;
+    yaz_sc_t s = yaz_sc_create("metaproxy", "metaproxy");
+
+    ret = yaz_sc_program(s, argc, argv, sc_main, sc_stop);
+
+    yaz_sc_destroy(&s);
+    exit(ret);
+}
+
+
 
 /*
  * Local variables: