提交 36d2d2f9 authored 作者: Brian West's avatar Brian West

LOGGER-3

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15162 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 836aefce
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<!-- info - informational message --> <!-- info - informational message -->
<!-- debug - debug-level message --> <!-- debug - debug-level message -->
<settings> <settings>
<param name="facility" value="user"/>
<param name="ident" value="freeswitch"/> <param name="ident" value="freeswitch"/>
<param name="loglevel" value="warning"/> <param name="loglevel" value="warning"/>
</settings> </settings>
......
...@@ -49,10 +49,12 @@ static switch_log_level_t log_level; ...@@ -49,10 +49,12 @@ static switch_log_level_t log_level;
static struct { static struct {
char *ident; char *ident;
char *format; char *format;
char *facility;
} globals; } globals;
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_ident, globals.ident); SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_ident, globals.ident);
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_format, globals.format); SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_format, globals.format);
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_facility, globals.facility);
static switch_loadable_module_interface_t console_module_interface = { static switch_loadable_module_interface_t console_module_interface = {
/*.module_name */ modname, /*.module_name */ modname,
...@@ -126,6 +128,8 @@ static switch_status_t load_config(void) ...@@ -126,6 +128,8 @@ static switch_status_t load_config(void)
set_global_ident(val); set_global_ident(val);
} else if (!strcmp(var, "format")) { } else if (!strcmp(var, "format")) {
set_global_format(val); set_global_format(val);
} else if (!strcmp(var, "facility")) {
set_global_facility(val);
} else if (!strcasecmp(var, "loglevel") && !switch_strlen_zero(val)) { } else if (!strcasecmp(var, "loglevel") && !switch_strlen_zero(val)) {
log_level = switch_log_str2level(val); log_level = switch_log_str2level(val);
if (log_level == SWITCH_LOG_INVALID) { if (log_level == SWITCH_LOG_INVALID) {
...@@ -144,7 +148,9 @@ static switch_status_t load_config(void) ...@@ -144,7 +148,9 @@ static switch_status_t load_config(void)
if (switch_strlen_zero(globals.format)) { if (switch_strlen_zero(globals.format)) {
set_global_format(DEFAULT_FORMAT); set_global_format(DEFAULT_FORMAT);
} }
if (switch_strlen_zero(globals.facility)) {
set_global_facility(DEFAULT_FACILITY);
}
return 0; return 0;
} }
...@@ -173,6 +179,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_syslog_shutdown) ...@@ -173,6 +179,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_syslog_shutdown)
switch_safe_free(globals.ident); switch_safe_free(globals.ident);
switch_safe_free(globals.format); switch_safe_free(globals.format);
switch_safe_free(globals.facility);
switch_log_unbind_logger(mod_syslog_logger); switch_log_unbind_logger(mod_syslog_logger);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论