X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmetaproxy_prog.cpp;h=b598a8184081816f1a148f1dfefeeac03f887e2c;hb=74d5524719194de5dc96abd552562fa473088677;hp=0f5548e11c7597b909600ebaac40f5cef70a81cb;hpb=6a96d6dfdbb724bdbdd5f86b2b6f1cbf6f294c50;p=metaproxy-moved-to-github.git diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp index 0f5548e..b598a81 100644 --- a/src/metaproxy_prog.cpp +++ b/src/metaproxy_prog.cpp @@ -1,7 +1,5 @@ -/* $Id: metaproxy_prog.cpp,v 1.15 2008-02-26 23:56:05 adam Exp $ - Copyright (c) 2005-2008, Index Data. - -This file is part of Metaproxy. +/* This file is part of Metaproxy. + 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 @@ -14,10 +12,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Metaproxy; see the file LICENSE. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. - */ +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ #include "config.hpp" @@ -25,26 +22,60 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include +#include #include #include #include -#include "filter.hpp" -#include "package.hpp" +#include +#include #include "router_flexml.hpp" #include "factory_static.hpp" +#if HAVE_UNISTD_H +#include +#endif +#include +#ifdef WIN32 +#include +#include +#include +#endif + 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 + routerp->start(); mp::Package pack; - pack.router(*routerp).move(); + pack.router(*routerp).move(); /* should never exit */ } -int main(int argc, char **argv) +static int sc_main( + yaz_sc_t s, + int argc, char **argv) { try { @@ -55,7 +86,7 @@ int main(int argc, char **argv) const char *pidfile = 0; const char *uid = 0; - while ((ret = options("c{config}:Dh{help}l:p:u:V{version}X", + while ((ret = options("c{config}:Dh{help}l:p:u:V{version}w:X", argv, argc, &arg)) != -2) { switch (ret) @@ -75,7 +106,13 @@ int main(int argc, char **argv) " -l f log file f\n" " -p f pid file f\n" " -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': @@ -88,23 +125,45 @@ int main(int argc, char **argv) uid = arg; break; case 'V': - std::cout << "Metaproxy " VERSION "\n"; + std::cout << VERSION; +#ifdef VERSION_SHA1 + std::cout << " " VERSION_SHA1; +#endif + std::cout << "\n"; + return 0; break; + case 'w': + if ( +#ifdef WIN32 + _chdir(arg) +#else + chdir(arg) +#endif + ) + { + std::cerr << "chdir " << arg << " failed" << std::endl; + 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\n"; - std::exit(1); + std::cerr << "No configuration given; use -h for help\n"; + 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 @@ -112,39 +171,75 @@ 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_sc_running(s); - yaz_daemon("metaproxy", mode, handler, &router, pidfile, uid); + yaz_daemon("metaproxy", mode, handler, 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: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil - * c-file-style: "stroustrup" * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +