From 18977d4257b95659ae967652284544b95f7bfd86 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Tue, 5 May 2015 14:58:26 -0400 Subject: [PATCH] remove calls to setlogmask (not atomic) --- daemon/log.c | 8 -------- daemon/main.c | 3 --- 2 files changed, 11 deletions(-) diff --git a/daemon/log.c b/daemon/log.c index a113c96dd..964f1ae00 100644 --- a/daemon/log.c +++ b/daemon/log.c @@ -194,11 +194,7 @@ out: } void cdrlog(const char* cdrbuffer) { - int previous; - int mask = LOG_MASK (LOG_INFO); - previous = setlogmask(mask); syslog(LOG_INFO | _log_facility_cdr, "%s", cdrbuffer); - setlogmask(previous); } static unsigned int log_limiter_entry_hash(const void *p) { @@ -216,11 +212,7 @@ static int log_limiter_entry_equal(const void *a, const void *b) { } void rtcplog(const char* cdrbuffer) { - int previous; - int mask = LOG_MASK (LOG_INFO); - previous = setlogmask(mask); syslog(LOG_INFO | _log_facility_rtcp, "%s", cdrbuffer); - setlogmask(previous); } void log_init() { diff --git a/daemon/main.c b/daemon/main.c index 660080128..5b1ebd1fd 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -139,7 +139,6 @@ static void sighandler(gpointer x) { else if (ret == SIGUSR1) { if (get_log_level() > 0) { g_atomic_int_add(&log_level, -1); - setlogmask(LOG_UPTO(get_log_level())); ilog(get_log_level(), "Set log level to %d\n", get_log_level()); } @@ -147,7 +146,6 @@ static void sighandler(gpointer x) { else if (ret == SIGUSR2) { if (get_log_level() < 7) { g_atomic_int_add(&log_level, 1); - setlogmask(LOG_UPTO(get_log_level())); ilog(get_log_level(), "Set log level to %d\n", get_log_level()); } @@ -367,7 +365,6 @@ static void options(int *argc, char ***argv) { if ((log_level < LOG_EMERG) || (log_level > LOG_DEBUG)) die("Invalid log level (--log_level)"); - setlogmask(LOG_UPTO(log_level)); if (log_facility_s) { if (!parse_log_facility(log_facility_s, &_log_facility)) {