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
limit=0 means unlimited MP-632
[metaproxy-moved-to-github.git]
/
src
/
metaproxy_prog.cpp
diff --git
a/src/metaproxy_prog.cpp
b/src/metaproxy_prog.cpp
index
083ea29
..
c470b90
100644
(file)
--- a/
src/metaproxy_prog.cpp
+++ b/
src/metaproxy_prog.cpp
@@
-1,5
+1,5
@@
/* This file is part of Metaproxy.
/* This file is part of Metaproxy.
- Copyright (C) 2005-2013 Index Data
+ Copyright (C) Index Data
Metaproxy is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Metaproxy is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@@
-23,6
+23,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <yaz/daemon.h>
#include <yaz/sc.h>
#include <yaz/daemon.h>
#include <yaz/sc.h>
+#include <yaz/backtrace.h>
#include <iostream>
#include <stdexcept>
#include <libxml/xinclude.h>
#include <iostream>
#include <stdexcept>
#include <libxml/xinclude.h>
@@
-58,21
+59,21
@@
static void set_log_prefix(void)
#if HAVE_UNISTD_H
static pid_t process_group = 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)
{
{
- 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);
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
}
#endif
@@
-81,9
+82,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();
@@
-93,9
+95,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);
}
@@
-125,6
+124,7
@@
static int sc_main(
const char *pidfile = 0;
const char *uid = 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",
set_log_prefix();
while ((ret = options("c{config}:Dh{help}l:m:p:tu:v:V{version}w:X",
@@
-218,6
+218,14
@@
static int sc_main(
, test_config ? "test" : "start"
);
, test_config ? "test" : "start"
);
+ char yaz_version_str[20];
+ char yaz_sha1_str[41];
+ yaz_version(yaz_version_str, yaz_sha1_str);
+ yaz_log(YLOG_LOG, "YAZ %s %s", yaz_version_str, yaz_sha1_str);
+
+ xmlInitParser();
+ LIBXML_TEST_VERSION
+
yaz_log_xml_errors(0, YLOG_LOG);
xmlDocPtr doc = xmlReadFile(fname,
NULL,
yaz_log_xml_errors(0, YLOG_LOG);
xmlDocPtr doc = xmlReadFile(fname,
NULL,
@@
-257,9
+265,11
@@
static int sc_main(
yaz_sc_running(s);
yaz_sc_running(s);
- yaz_daemon("metaproxy", mode, mode == YAZ_DAEMON_DEBUG ?
- work_debug : work_normal, router, pidfile, uid);
+ yaz_daemon("metaproxy", mode | YAZ_DAEMON_LOG_REOPEN,
+ (mode & YAZ_DAEMON_FORK) ? work_normal : work_debug,
+ router, pidfile, uid);
}
}
+ delete router;
}
catch (std::logic_error &e) {
yaz_log(YLOG_FATAL,"std::logic error: %s" , e.what() );
}
catch (std::logic_error &e) {
yaz_log(YLOG_FATAL,"std::logic error: %s" , e.what() );