mp::RouterFleXML *routerp = 0;
+static void set_log_prefix(void)
+{
+#if HAVE_UNISTD_H
+ char str[80];
+
+ sprintf(str, "%lld", (long long) getpid());
+ yaz_log_init_prefix(str);
+#endif
+}
+
#if HAVE_UNISTD_H
static pid_t process_group = 0;
{
yaz_log(YLOG_LOG, "metaproxy received SIGUSR1");
routerp->stop();
- yaz_daemon_stop();
}
static void sig_term_handler(int s)
static void work_common(void *data)
{
+ set_log_prefix();
#if HAVE_UNISTD_H
process_group = getpgid(0); // save process group ID
{
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",
+
+ set_log_prefix();
+
+ 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;
}
-
- 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"
);
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");
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);
}
ret = 1;
}
xmlFreeDoc(doc);
+ if (test_config)
+ yaz_log(YLOG_LOG, "metaproxy test exit code %d", ret);
return ret;
}