retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

fix logical error 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1830 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2006-07-11 17:39:50 +00:00
parent c36145e58b
commit 34882f7a60
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/mod/loggers/mod_syslog/mod_syslog.c
View File

@ -106,12 +106,15 @@ static switch_status_t mod_syslog_logger(const switch_log_node_t *node, switch_l
SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **interface, char *filename)
{
*interface = &console_module_interface;
switch_status_t status;
switch_log_bind_logger(mod_syslog_logger, SWITCH_LOG_DEBUG);
load_config();
if ((status=load_config()) != SWITCH_STATUS_SUCCESS) {
return status;
}
openlog(globals.ident, LOG_PID, LOG_USER);
switch_log_bind_logger(mod_syslog_logger, SWITCH_LOG_DEBUG);
return SWITCH_STATUS_SUCCESS;
}
@ -129,27 +132,28 @@ static switch_status_t load_config(void)
char *var, *val;
char *cf = "syslog.conf";
if (!switch_config_open_file(&cfg, cf)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf);
return SWITCH_STATUS_TERM;
}
memset(&globals, 0, sizeof(globals));
while (switch_config_next_pair(&cfg, &var, &val)) {
if (!strcasecmp(cfg.category, "settings")) {
if (!strcmp(var, "ident")) {
set_global_ident(val);
} else if (!strcmp(var, "facility")) {
set_global_facility(val);
} else if (!strcmp(var, "format")) {
set_global_format(val);
} else if (!strcmp(var, "level")) {
set_global_level(val);;
if (switch_config_open_file(&cfg, cf)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf);
while (switch_config_next_pair(&cfg, &var, &val)) {
if (!strcasecmp(cfg.category, "settings")) {
if (!strcmp(var, "ident")) {
set_global_ident(val);
} else if (!strcmp(var, "facility")) {
set_global_facility(val);
} else if (!strcmp(var, "format")) {
set_global_format(val);
} else if (!strcmp(var, "level")) {
set_global_level(val);;
}
}
}
switch_config_close_file(&cfg);
}
switch_config_close_file(&cfg);
if (switch_strlen_zero(globals.ident)) {
set_global_ident(DEFAULT_IDENT);
}