From: Brian West Date: Fri, 14 Apr 2006 15:59:22 +0000 (+0000) Subject: console tweak X-Git-Tag: v1.0-beta1~2852 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ec4d1047996a68bcde9485fa141370044e9af1e;p=thirdparty%2Ffreeswitch.git console tweak git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1156 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- diff --git a/src/mod/loggers/mod_console/mod_console.c b/src/mod/loggers/mod_console/mod_console.c index 092bcfb4bd..125468d073 100644 --- a/src/mod/loggers/mod_console/mod_console.c +++ b/src/mod/loggers/mod_console/mod_console.c @@ -73,6 +73,7 @@ static void add_mapping(char *var, char *val) name = switch_core_strdup(module_pool, var); switch_core_hash_insert(name_hash, name, name); } + del_mapping(name); switch_core_hash_insert(log_hash, name, (void *) &STATIC_LEVELS[(uint8_t)switch_log_str2level(val)]); } @@ -108,9 +109,7 @@ static switch_status switch_console_logger(const switch_log_node *node, switch_l uint8_t *lookup = NULL; switch_log_level level = SWITCH_LOG_DEBUG; - if (all_level > -1) { - level = (switch_log_level) all_level; - } else if (log_hash) { + if (log_hash) { lookup = switch_core_hash_find(log_hash, node->file); if (!lookup) { @@ -120,8 +119,10 @@ static switch_status switch_console_logger(const switch_log_node *node, switch_l if (lookup) { level = (switch_log_level) *lookup; - } - + } else if (all_level > -1) { + level = (switch_log_level) all_level; + } + if (!log_hash || (((all_level > - 1) || lookup) && level >= node->level)) { fprintf(handle, node->data); }