X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmetaproxy_prog.cpp;h=5d176aeb51755d3e9f9230b4fb0bdbd4c1af6689;hb=9fcdfa67cc281509e0f11e1f2aba255718a80cbd;hp=76113f329aeafc580f6ed2b2733a856fbae17f41;hpb=1e70857c889965912be219bfca37471173c56249;p=metaproxy-moved-to-github.git diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp index 76113f3..5d176ae 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) 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 @@ -30,8 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include -#include "router_flexml.hpp" -#include "factory_static.hpp" +#include #if HAVE_UNISTD_H #include @@ -45,41 +44,56 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA namespace mp = metaproxy_1; -mp::RouterFleXML *routerp = 0; +mp::RouterXML *routerp = 0; +static void set_log_prefix(void) +{ #if HAVE_UNISTD_H -static pid_t process_group = 0; + char str[80]; -static void sig_usr1_handler(int s) -{ - yaz_log(YLOG_LOG, "metaproxy received SIGUSR1"); - routerp->stop(); - yaz_daemon_stop(); + sprintf(str, "%lld", (long long) getpid()); + yaz_log_init_prefix(str); +#endif } -static void sig_term_handler(int s) +#if HAVE_UNISTD_H +static pid_t process_group = 0; +static int sig_received = 0; +static pid_t my_pid = 0; + +static void sig_x_handler(int signo) { - yaz_log(YLOG_LOG, "metaproxy received SIGTERM"); - yaz_log(YLOG_LOG, "metaproxy stop"); - kill(-process_group, SIGTERM); /* kill all children processes as well */ - _exit(0); + if (sig_received) + return; + if ( getpid() != my_pid ) // can happen in unlikely cases + return; // when the sig hits a child just after fork(), before it + // clears its sighandler. MP-559. + sig_received = signo; + if (routerp) + routerp->stop(signo); + if (signo == SIGTERM) + kill(-process_group, SIGTERM); /* kill all children processes as well */ } #endif static void work_common(void *data) { + set_log_prefix(); #if HAVE_UNISTD_H process_group = getpgid(0); // save process group ID + my_pid = getpid(); - signal(SIGTERM, sig_term_handler); - signal(SIGUSR1, sig_usr1_handler); + signal(SIGTERM, sig_x_handler); + signal(SIGUSR1, sig_x_handler); #endif - routerp = (mp::RouterFleXML*) data; + routerp = (mp::RouterXML*) data; routerp->start(); mp::Package pack; pack.router(*routerp).move(); - yaz_log(YLOG_LOG, "metaproxy stop"); /* only for graceful stop */ + yaz_log(YLOG_LOG, "metaproxy stop"); + delete routerp; + routerp = 0; _exit(0); } @@ -87,7 +101,7 @@ static void work_debug(void *data) { work_common(data); } - + static void work_normal(void *data) { #if HAVE_UNISTD_H @@ -108,8 +122,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:m:p:tu:v:V{version}w:X", argv, argc, &arg)) != -2) { switch (ret) @@ -124,9 +140,11 @@ static int sc_main( std::cerr << "metaproxy\n" " -h|--help help\n" " -V|--version version\n" + " -v level\n" " -c|--config f config filename\n" " -D daemon and keepalive operation\n" " -l f log file f\n" + " -m logformat log time format (strftime)\n" " -p f pid file f\n" " -t test configuration\n" " -u id change uid to id\n" @@ -136,12 +154,15 @@ static int sc_main( " -install install windows service\n" " -remove remove windows service\n" #endif - + << std::endl; break; case 'l': yaz_log_init_file(arg); break; + case 'm': + yaz_log_time_format(arg); + break; case 'p': pidfile = arg; break; @@ -151,6 +172,9 @@ static int sc_main( case 'u': uid = arg; break; + case 'v': + yaz_log_init_level(yaz_log_mask_str(arg)); + break; case 'V': std::cout << VERSION; #ifdef VERSION_SHA1 @@ -166,7 +190,7 @@ static int sc_main( #else chdir(arg) #endif - ) + ) { std::cerr << "chdir " << arg << " failed" << std::endl; return 1; @@ -184,20 +208,23 @@ static int sc_main( std::cerr << "No configuration given; use -h for help\n"; return 1; } - - if (!test_config) - yaz_log(YLOG_LOG, "metaproxy start " VERSION + + yaz_log(YLOG_LOG, "metaproxy %s " VERSION #ifdef VERSION_SHA1 " " VERSION_SHA1 #endif + , test_config ? "test" : "start" ); + xmlInitParser(); + LIBXML_TEST_VERSION + 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"); @@ -224,14 +251,13 @@ static int sc_main( wrbuf_puts(base_path, "."); ret = 0; try { - mp::FactoryStatic factory; - mp::RouterFleXML *router = - new mp::RouterFleXML(doc, factory, test_config, wrbuf_cstr(base_path)); + mp::RouterXML *router = + new mp::RouterXML(doc, 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); } @@ -249,6 +275,8 @@ static int sc_main( ret = 1; } xmlFreeDoc(doc); + if (test_config) + yaz_log(YLOG_LOG, "metaproxy test exit code %d", ret); return ret; }