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
Postpone yaz_daemon_stop until out of router loop
[metaproxy-moved-to-github.git]
/
src
/
metaproxy_prog.cpp
diff --git
a/src/metaproxy_prog.cpp
b/src/metaproxy_prog.cpp
index
0deb96e
..
d082124
100644
(file)
--- a/
src/metaproxy_prog.cpp
+++ b/
src/metaproxy_prog.cpp
@@
-69,7
+69,7
@@
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(SIGUSR1, sig_usr1_handler);
#endif
signal(SIGTERM, sig_term_handler);
signal(SIGUSR1, sig_usr1_handler);
#endif
@@
-78,11
+78,8
@@
static void work_common(void *data)
mp::Package pack;
pack.router(*routerp).move();
mp::Package pack;
pack.router(*routerp).move();
- /* this only exits if graceful stop is received (sig_usr1_handler) */
- yaz_log(YLOG_LOG, "metaproxy stop");
-#if HAVE_UNISTD_H
- kill(-process_group, SIGTERM); /* kill all children processes as well */
-#endif
+ yaz_log(YLOG_LOG, "metaproxy stop"); /* only for graceful stop */
+ yaz_daemon_stop();
_exit(0);
}
_exit(0);
}
@@
-188,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
@@
-201,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
@@
-238,7
+237,7
@@
static int sc_main(
}
}
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) {
@@
-269,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