From e84c2f52c364abd7294d326712923a9783b91b77 Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Wed, 2 Oct 2013 12:28:26 +0300 Subject: [PATCH] added log level handling to debian default file and init script - fixed indentation in main.c --- daemon/main.c | 20 ++++++++++---------- debian/ngcp-mediaproxy-ng-daemon.default | 1 + debian/ngcp-mediaproxy-ng-daemon.init | 1 + 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/daemon/main.c b/daemon/main.c index 8a922bc8e..ae6dd2bd7 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -114,18 +114,18 @@ static void sighandler(gpointer x) { if (ret == SIGINT || ret == SIGTERM) global_shutdown = 1; else if (ret == SIGUSR1) { - if (log_level > 0) { - log_level--; - setlogmask(LOG_UPTO(log_level)); - mylog(log_level, "Set log level to %d\n", log_level); - } + if (log_level > 0) { + log_level--; + setlogmask(LOG_UPTO(log_level)); + mylog(log_level, "Set log level to %d\n", log_level); + } } else if (ret == SIGUSR2) { - if (log_level < 7) { - log_level++; - setlogmask(LOG_UPTO(log_level)); - mylog(log_level, "Set log level to %d\n", log_level); - } + if (log_level < 7) { + log_level++; + setlogmask(LOG_UPTO(log_level)); + mylog(log_level, "Set log level to %d\n", log_level); + } } else abort(); diff --git a/debian/ngcp-mediaproxy-ng-daemon.default b/debian/ngcp-mediaproxy-ng-daemon.default index e0b2c3e9a..7784d253e 100644 --- a/debian/ngcp-mediaproxy-ng-daemon.default +++ b/debian/ngcp-mediaproxy-ng-daemon.default @@ -18,3 +18,4 @@ TABLE=0 # REDIS=127.0.0.1:6379 # REDIS_DB=1 # B2B_URL=http://127.0.0.1:8090/ +# LOG_LEVEL=6 diff --git a/debian/ngcp-mediaproxy-ng-daemon.init b/debian/ngcp-mediaproxy-ng-daemon.init index b10dd6c3b..ec944c80b 100755 --- a/debian/ngcp-mediaproxy-ng-daemon.init +++ b/debian/ngcp-mediaproxy-ng-daemon.init @@ -61,6 +61,7 @@ OPTIONS="" [ -z "$B2B_URL" ] || OPTIONS="$OPTIONS --b2b-url=$B2B_URL" [ -z "$NO_FALLBACK" -o \( "$NO_FALLBACK" != "1" -a "$NO_FALLBACK" != "yes" \) ] || OPTIONS="$OPTIONS --no-fallback" OPTIONS="$OPTIONS --table=$TABLE" +[ -z "$LOG_LEVEL" ] || OPTIONS="$OPTIONS --log-level=$LOG_LEVEL" if test "$FORK" = "no" ; then OPTIONS="$OPTIONS --foreground" fi