X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fmetaproxy_prog.cpp;h=b598a8184081816f1a148f1dfefeeac03f887e2c;hb=ff4921cc3b96c81d2704417b311f217bf3663a4d;hp=c1f612306c5335d61d4f8135b21c9133012c067e;hpb=c92f67c2cee4deb11f96b79ff10a6f7a5ba49f15;p=metaproxy-moved-to-github.git diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp index c1f6123..b598a81 100644 --- a/src/metaproxy_prog.cpp +++ b/src/metaproxy_prog.cpp @@ -52,7 +52,7 @@ 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); + _exit(0); } #endif @@ -67,6 +67,7 @@ static void handler(void *data) signal(SIGTERM, sig_term_handler); #endif + routerp->start(); mp::Package pack; pack.router(*routerp).move(); /* should never exit */ @@ -124,7 +125,11 @@ static int sc_main( uid = arg; break; case 'V': - std::cout << VERSION "\n"; + std::cout << VERSION; +#ifdef VERSION_SHA1 + std::cout << " " VERSION_SHA1; +#endif + std::cout << "\n"; return 0; break; case 'w': @@ -153,7 +158,12 @@ static int sc_main( 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