提交 840b9f33 authored 作者: Anthony Minessale's avatar Anthony Minessale

minor logger tweaks

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9035 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 6e4a679e
...@@ -62,6 +62,7 @@ static switch_queue_t *LOG_RECYCLE_QUEUE = NULL; ...@@ -62,6 +62,7 @@ static switch_queue_t *LOG_RECYCLE_QUEUE = NULL;
static int8_t THREAD_RUNNING = 0; static int8_t THREAD_RUNNING = 0;
static uint8_t MAX_LEVEL = 0; static uint8_t MAX_LEVEL = 0;
static int mods_loaded = 0; static int mods_loaded = 0;
static int console_mods_loaded = 0;
static switch_bool_t COLORIZE = SWITCH_FALSE; static switch_bool_t COLORIZE = SWITCH_FALSE;
#ifdef WIN32 #ifdef WIN32
...@@ -144,8 +145,9 @@ SWITCH_DECLARE(switch_status_t) switch_log_unbind_logger(switch_log_function_t f ...@@ -144,8 +145,9 @@ SWITCH_DECLARE(switch_status_t) switch_log_unbind_logger(switch_log_function_t f
BINDINGS = ptr->next; BINDINGS = ptr->next;
} }
status = SWITCH_STATUS_SUCCESS; status = SWITCH_STATUS_SUCCESS;
mods_loaded--;
if (ptr->is_console) { if (ptr->is_console) {
mods_loaded--; console_mods_loaded--;
} }
break; break;
} }
...@@ -182,8 +184,9 @@ SWITCH_DECLARE(switch_status_t) switch_log_bind_logger(switch_log_function_t fun ...@@ -182,8 +184,9 @@ SWITCH_DECLARE(switch_status_t) switch_log_bind_logger(switch_log_function_t fun
BINDINGS = binding; BINDINGS = binding;
} }
if (is_console) { if (is_console) {
mods_loaded++; console_mods_loaded++;
} }
mods_loaded++;
switch_mutex_unlock(BINDLOCK); switch_mutex_unlock(BINDLOCK);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
...@@ -230,6 +233,7 @@ static void *SWITCH_THREAD_FUNC log_thread(switch_thread_t *thread, void *obj) ...@@ -230,6 +233,7 @@ static void *SWITCH_THREAD_FUNC log_thread(switch_thread_t *thread, void *obj)
return NULL; return NULL;
} }
#define do_mods (LOG_QUEUE && THREAD_RUNNING)
SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char *file, const char *func, int line, SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char *file, const char *func, int line,
const char *userdata, switch_log_level_t level, const char *fmt, ...) const char *userdata, switch_log_level_t level, const char *fmt, ...)
{ {
...@@ -300,8 +304,8 @@ SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char ...@@ -300,8 +304,8 @@ SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char
goto end; goto end;
} }
if (level == SWITCH_LOG_CONSOLE || mods_loaded == 0 || !LOG_QUEUE || !THREAD_RUNNING) { if (console_mods_loaded == 0 || !do_mods) {
if (handle) { if (handle) {
int aok = 1; int aok = 1;
#ifndef WIN32 #ifndef WIN32
...@@ -336,7 +340,9 @@ SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char ...@@ -336,7 +340,9 @@ SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char
} }
} }
} }
} else if (level <= MAX_LEVEL) { }
if (do_mods && level <= MAX_LEVEL) {
switch_log_node_t *node; switch_log_node_t *node;
void *pop = NULL; void *pop = NULL;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论