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
Don't display start log message when config testing (-t)
[metaproxy-moved-to-github.git]
/
src
/
metaproxy_prog.cpp
diff --git
a/src/metaproxy_prog.cpp
b/src/metaproxy_prog.cpp
index
4f28e4f
..
76113f3
100644
(file)
--- a/
src/metaproxy_prog.cpp
+++ b/
src/metaproxy_prog.cpp
@@
-50,34
+50,51
@@
mp::RouterFleXML *routerp = 0;
#if HAVE_UNISTD_H
static pid_t process_group = 0;
#if HAVE_UNISTD_H
static pid_t process_group = 0;
+static void sig_usr1_handler(int s)
+{
+ yaz_log(YLOG_LOG, "metaproxy received SIGUSR1");
+ routerp->stop();
+ yaz_daemon_stop();
+}
+
static void sig_term_handler(int s)
{
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);
}
#endif
kill(-process_group, SIGTERM); /* kill all children processes as well */
_exit(0);
}
#endif
-static void handler_debug(void *data)
+static void work_common(void *data)
{
#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 */
+ _exit(0);
+}
+
+static void work_debug(void *data)
+{
+ work_common(data);
}
}
-static void handler_normal(void *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(
@@
-168,12
+185,14
@@
static int sc_main(
return 1;
}
return 1;
}
- yaz_log(YLOG_LOG, "Metaproxy start " VERSION
+ if (!test_config)
+ yaz_log(YLOG_LOG, "metaproxy start " VERSION
#ifdef VERSION_SHA1
#ifdef VERSION_SHA1
- " " VERSION_SHA1
+ " " VERSION_SHA1
#endif
#endif
- );
-
+ );
+
+ yaz_log_xml_errors(0, YLOG_LOG);
xmlDocPtr doc = xmlReadFile(fname,
NULL,
XML_PARSE_XINCLUDE + XML_PARSE_NOBLANKS
xmlDocPtr doc = xmlReadFile(fname,
NULL,
XML_PARSE_XINCLUDE + XML_PARSE_NOBLANKS
@@
-181,7
+200,7
@@
static int sc_main(
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,11
+233,11
@@
static int sc_main(
yaz_sc_running(s);
yaz_daemon("metaproxy", mode, mode == YAZ_DAEMON_DEBUG ?
yaz_sc_running(s);
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) {
@@
-249,8
+268,6
@@
int main(int argc, char **argv)
exit(ret);
}
exit(ret);
}
-
-
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4