projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mp_util::get_init_diagnostics based on yaz_decode_init_diag
[metaproxy-moved-to-github.git]
/
src
/
metaproxy_prog.cpp
diff --git
a/src/metaproxy_prog.cpp
b/src/metaproxy_prog.cpp
index
ce60c60
..
f8ead5c
100644
(file)
--- a/
src/metaproxy_prog.cpp
+++ b/
src/metaproxy_prog.cpp
@@
-47,41
+47,65
@@
namespace mp = metaproxy_1;
mp::RouterFleXML *routerp = 0;
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;
#if HAVE_UNISTD_H
static pid_t process_group = 0;
-static void sig_term_handler(int s)
+static void sig_usr1_handler(int s)
{
{
+ yaz_log(YLOG_LOG, "metaproxy received SIGUSR1");
routerp->stop();
routerp->stop();
-#if 0
+}
+
+static void sig_term_handler(int s)
+{
+ 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);
kill(-process_group, SIGTERM); /* kill all children processes as well */
_exit(0);
-#endif
}
#endif
}
#endif
-static void handler_debug(void *data)
+static void work_common(void *data)
{
{
+ set_log_prefix();
#if HAVE_UNISTD_H
process_group = getpgid(0); // save process group ID
#if HAVE_UNISTD_H
process_group = getpgid(0); // save process group ID
-
+
signal(SIGTERM, sig_term_handler);
signal(SIGTERM, sig_term_handler);
+ signal(SIGUSR1, sig_usr1_handler);
#endif
routerp = (mp::RouterFleXML*) data;
routerp->start();
mp::Package pack;
#endif
routerp = (mp::RouterFleXML*) data;
routerp->start();
mp::Package pack;
- pack.router(*routerp).move(); /* should never exit */
+ pack.router(*routerp).move();
+ yaz_log(YLOG_LOG, "metaproxy stop"); /* only for graceful stop */
+ kill(-process_group, SIGTERM); /* kill all children processes as well */
_exit(0);
}
_exit(0);
}
-
-static void handler_normal(void *data)
+
+static void work_debug(void *data)
+{
+ work_common(data);
+}
+
+static void work_normal(void *data)
{
#if HAVE_UNISTD_H
/* make the current working process group leader */
setpgid(0, 0);
#endif
{
#if HAVE_UNISTD_H
/* make the current working process group leader */
setpgid(0, 0);
#endif
- handler_debug(data);
+ work_common(data);
}
static int sc_main(
}
static int sc_main(
@@
-95,8
+119,10
@@
static int sc_main(
unsigned mode = 0;
const char *pidfile = 0;
const char *uid = 0;
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)
argv, argc, &arg)) != -2)
{
switch (ret)
@@
-123,7
+149,7
@@
static int sc_main(
" -install install windows service\n"
" -remove remove windows service\n"
#endif
" -install install windows service\n"
" -remove remove windows service\n"
#endif
-
+
<< std::endl;
break;
case 'l':
<< std::endl;
break;
case 'l':
@@
-153,7
+179,7
@@
static int sc_main(
#else
chdir(arg)
#endif
#else
chdir(arg)
#endif
- )
+ )
{
std::cerr << "chdir " << arg << " failed" << std::endl;
return 1;
{
std::cerr << "chdir " << arg << " failed" << std::endl;
return 1;
@@
-171,21
+197,23
@@
static int sc_main(
std::cerr << "No configuration given; use -h for help\n";
return 1;
}
std::cerr << "No configuration given; use -h for help\n";
return 1;
}
-
- yaz_log(YLOG_LOG, "Metaproxy start " VERSION
+
+ yaz_log(YLOG_LOG, "metaproxy %s " VERSION
#ifdef VERSION_SHA1
#ifdef VERSION_SHA1
- " " VERSION_SHA1
+ " " VERSION_SHA1
#endif
#endif
- );
-
+ , test_config ? "test" : "start"
+ );
+
+ yaz_log_xml_errors(0, YLOG_LOG);
xmlDocPtr doc = xmlReadFile(fname,
xmlDocPtr doc = xmlReadFile(fname,
- NULL,
+ NULL,
XML_PARSE_XINCLUDE + XML_PARSE_NOBLANKS
+ XML_PARSE_NSCLEAN + XML_PARSE_NONET );
XML_PARSE_XINCLUDE + XML_PARSE_NOBLANKS
+ XML_PARSE_NSCLEAN + XML_PARSE_NONET );
-
+
if (!doc)
{
if (!doc)
{
- yaz_log (YLOG_FATAL,"XML parsing failed");
+ yaz_log(YLOG_FATAL,"XML parsing failed");
return 1;
}
// and perform Xinclude then
return 1;
}
// and perform Xinclude then
@@
-214,15
+242,15
@@
static int sc_main(
new mp::RouterFleXML(doc, factory, test_config, wrbuf_cstr(base_path));
if (!test_config)
{
new mp::RouterFleXML(doc, factory, test_config, wrbuf_cstr(base_path));
if (!test_config)
{
-
+
yaz_sc_running(s);
yaz_sc_running(s);
-
+
yaz_daemon("metaproxy", mode, mode == YAZ_DAEMON_DEBUG ?
yaz_daemon("metaproxy", mode, mode == YAZ_DAEMON_DEBUG ?
- handler_debug : handler_normal, router, pidfile, uid);
+ work_debug : work_normal, router, pidfile, uid);
}
}
catch (std::logic_error &e) {
}
}
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) {
ret = 1;
}
catch (std::runtime_error &e) {
@@
-234,6
+262,8
@@
static int sc_main(
ret = 1;
}
xmlFreeDoc(doc);
ret = 1;
}
xmlFreeDoc(doc);
+ if (test_config)
+ yaz_log(YLOG_LOG, "metaproxy test exit code %d", ret);
return ret;
}
return ret;
}
@@
-253,8
+283,6
@@
int main(int argc, char **argv)
exit(ret);
}
exit(ret);
}
-
-
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4