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
Use yaz_daemon_stop for graceful stop
[metaproxy-moved-to-github.git]
/
src
/
metaproxy_prog.cpp
diff --git
a/src/metaproxy_prog.cpp
b/src/metaproxy_prog.cpp
index
ce60c60
..
6ecc5f0
100644
(file)
--- a/
src/metaproxy_prog.cpp
+++ b/
src/metaproxy_prog.cpp
@@
-50,38
+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_term_handler(int s)
+static void sig_usr1_handler(int s)
{
{
+ yaz_log(YLOG_LOG, "metaproxy received SIGUSR1");
routerp->stop();
routerp->stop();
-#if 0
+ yaz_daemon_stop();
+}
+
+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)
{
#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);
}
_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(
@@
-172,7
+185,7
@@
static int sc_main(
return 1;
}
return 1;
}
- yaz_log(YLOG_LOG, "Metaproxy start " VERSION
+ yaz_log(YLOG_LOG, "metaproxy start " VERSION
#ifdef VERSION_SHA1
" " VERSION_SHA1
#endif
#ifdef VERSION_SHA1
" " VERSION_SHA1
#endif
@@
-218,7
+231,7
@@
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) {