We need to use SIGHUP for reload of configuration
---
src/base/daemon.c | 5 +++--
src/base/logtrace.cc | 22 ----------------------
2 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/src/base/daemon.c b/src/base/daemon.c
index 4a37c4174..cdde7fde0 100644
--- a/src/base/daemon.c
+++ b/src/base/daemon.c
@@ -416,6 +416,7 @@ void daemonize(int argc, char *argv[])
signal(SIGTTOU, SIG_IGN);
signal(SIGTTIN, SIG_IGN);
signal(SIGTERM, SIG_DFL); /* Die on SIGTERM */
+ signal(SIGHUP, SIG_IGN);
/* RUNASROOT gives the OpenSAF user a possibility to maintain the 4.1 behaviour
* should eventually be removed.
@@ -686,8 +687,8 @@ done:
*/
static void install_fatal_signal_handlers(void)
{
- const int HANDLED_SIGNALS_MAX = 7;
- static const int handled_signals[] = {SIGHUP, SIGILL, SIGABRT, SIGFPE,
+ const int HANDLED_SIGNALS_MAX = 6;
+ static const int handled_signals[] = {SIGILL, SIGABRT, SIGFPE,
SIGSEGV, SIGPIPE, SIGBUS};
// to circumvent lsb use dlsym to retrieve backtrace in runtime
diff --git a/src/base/logtrace.cc b/src/base/logtrace.cc
index c1a194f60..8908c1ff3 100644
--- a/src/base/logtrace.cc
+++ b/src/base/logtrace.cc
@@ -75,22 +75,6 @@ static void sigusr2_handler(int sig) {
trace_category_set(trace_mask);
}
-/**
- * HUP signal handler to toggle info log level on/off
- * @param sig
- */
-static void sighup_handler(int sig) {
- if ((global::logmask & LOG_MASK(LOG_INFO)) & LOG_MASK(LOG_INFO)) {
- global::logmask = LOG_UPTO(LOG_NOTICE);
- syslog(LOG_NOTICE, "logtrace: info level disabled");
- } else {
- global::logmask = LOG_UPTO(LOG_INFO);
- syslog(LOG_NOTICE, "logtrace: info level enabled");
- }
-
- setlogmask(global::logmask);
-}
-
void trace_output(const char *file, unsigned line, unsigned priority,
unsigned category, const char *format, va_list ap) {
char preamble[288];
@@ -275,12 +259,6 @@ int logtrace_init_daemon(const char *ident, const char
*pathname,
setlogmask(logmask);
- if (signal(SIGHUP, sighup_handler) == SIG_ERR) {
- syslog(LOG_ERR, "logtrace: registering SIGHUP failed, (%s)",
- strerror(errno));
- return -1;
- }
-
global::logmask = logmask;
return logtrace_init(ident, pathname, tracemask);
--
2.17.1
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
