#include <yaz/daemon.h>
#include <yaz/sc.h>
+#include <yaz/backtrace.h>
#include <iostream>
#include <stdexcept>
#include <libxml/xinclude.h>
#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)
{
- yaz_log(YLOG_LOG, "metaproxy received SIGUSR1");
+ 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);
-}
-
-static void sig_term_handler(int signo)
-{
- if (routerp)
- {
- yaz_log(YLOG_LOG, "metaproxy received SIGTERM");
- routerp->stop(signo);
- }
+ if (signo == SIGTERM)
+ kill(-process_group, SIGTERM); /* kill all children processes as well */
}
#endif
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();
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);
}
const char *pidfile = 0;
const char *uid = 0;
+ yaz_enable_panic_backtrace(argv[0]);
set_log_prefix();
while ((ret = options("c{config}:Dh{help}l:m:p:tu:v:V{version}w:X",
, test_config ? "test" : "start"
);
+ xmlInitParser();
+ LIBXML_TEST_VERSION
+
yaz_log_xml_errors(0, YLOG_LOG);
xmlDocPtr doc = xmlReadFile(fname,
NULL,
yaz_daemon("metaproxy", mode, mode == YAZ_DAEMON_DEBUG ?
work_debug : work_normal, router, pidfile, uid);
}
+ delete router;
}
catch (std::logic_error &e) {
yaz_log(YLOG_FATAL,"std::logic error: %s" , e.what() );