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
Remove trailing-whitespace
[metaproxy-moved-to-github.git]
/
src
/
metaproxy_prog.cpp
diff --git
a/src/metaproxy_prog.cpp
b/src/metaproxy_prog.cpp
index
481901b
..
62860ad
100644
(file)
--- a/
src/metaproxy_prog.cpp
+++ b/
src/metaproxy_prog.cpp
@@
-59,21
+59,20
@@
static void set_log_prefix(void)
#if HAVE_UNISTD_H
static pid_t process_group = 0;
static int sig_received = 0;
#if HAVE_UNISTD_H
static pid_t process_group = 0;
static int sig_received = 0;
+static pid_t my_pid = 0;
-static void sig_usr1_handler(int signo)
+static void sig_x_handler(int signo)
{
{
+ if (sig_received)
+ return;
+ if ( getpid() != my_pid ) // can happen in unlikely cases
+ return; // when the sig hits a child just after fork(), before it
+ // clears its sighandler. MP-559.
sig_received = signo;
if (routerp)
routerp->stop(signo);
sig_received = signo;
if (routerp)
routerp->stop(signo);
-}
-
-static void sig_term_handler(int signo)
-{
- sig_received = signo;
- if (routerp)
- {
- routerp->stop(signo);
- }
+ if (signo == SIGTERM)
+ kill(-process_group, SIGTERM); /* kill all children processes as well */
}
#endif
}
#endif
@@
-82,9
+81,10
@@
static void work_common(void *data)
set_log_prefix();
#if HAVE_UNISTD_H
process_group = getpgid(0); // save process group ID
set_log_prefix();
#if HAVE_UNISTD_H
process_group = getpgid(0); // save process group ID
+ my_pid = getpid();
- signal(SIGTERM, sig_term_handler);
- signal(SIGUSR1, sig_usr1_handler);
+ signal(SIGTERM, sig_x_handler);
+ signal(SIGUSR1, sig_x_handler);
#endif
routerp = (mp::RouterXML*) data;
routerp->start();
#endif
routerp = (mp::RouterXML*) data;
routerp->start();
@@
-94,9
+94,6
@@
static void work_common(void *data)
yaz_log(YLOG_LOG, "metaproxy stop");
delete routerp;
routerp = 0;
yaz_log(YLOG_LOG, "metaproxy stop");
delete routerp;
routerp = 0;
-#if HAVE_UNISTD_H
- kill(-process_group, SIGTERM); /* kill all children processes as well */
-#endif
_exit(0);
}
_exit(0);
}