{
#if HAVE_UNISTD_H
process_group = getpgid(0); // save process group ID
-
+
signal(SIGTERM, sig_term_handler);
signal(SIGUSR1, sig_usr1_handler);
#endif
mp::Package pack;
pack.router(*routerp).move();
- /* this only exits if graceful stop is received (sig_usr1_handler) */
- yaz_log(YLOG_LOG, "metaproxy stop");
- kill(-process_group, SIGTERM); /* kill all children processes as well */
+ yaz_log(YLOG_LOG, "metaproxy stop"); /* only for graceful stop */
_exit(0);
}
{
work_common(data);
}
-
+
static void work_normal(void *data)
{
#if HAVE_UNISTD_H
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",
+
+ while ((ret = options("c{config}:Dh{help}l:p:tu:V{version}w:X",
argv, argc, &arg)) != -2)
{
switch (ret)
" -install install windows service\n"
" -remove remove windows service\n"
#endif
-
+
<< std::endl;
break;
case 'l':
#else
chdir(arg)
#endif
- )
+ )
{
std::cerr << "chdir " << arg << " failed" << std::endl;
return 1;
std::cerr << "No configuration given; use -h for help\n";
return 1;
}
-
- yaz_log(YLOG_LOG, "metaproxy start " VERSION
+
+ if (!test_config)
+ yaz_log(YLOG_LOG, "metaproxy start " VERSION
#ifdef VERSION_SHA1
- " " VERSION_SHA1
+ " " VERSION_SHA1
#endif
- );
-
+ );
+
+ 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");
+ yaz_log(YLOG_FATAL,"XML parsing failed");
return 1;
}
// and perform Xinclude then
new mp::RouterFleXML(doc, factory, 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);
}
}
catch (std::logic_error &e) {
- yaz_log (YLOG_FATAL,"std::logic error: %s" , e.what() );
+ yaz_log(YLOG_FATAL,"std::logic error: %s" , e.what() );
ret = 1;
}
catch (std::runtime_error &e) {
exit(ret);
}
-
-
/*
* Local variables:
* c-basic-offset: 4