kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-03 19:16:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Logger: Reset defaults before processing config." into 13

Browse Source
This commit is contained in:
Matt Jordan
2015-05-21 07:21:44 -05:00
committed by Gerrit Code Review
parent e8a4e01c32 9b6e228419
commit f5e195b44e
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
main/logger.c
View File

@@ -383,16 +383,25 @@ static int init_logger_chain(int locked, const char *altconf)
const char *s; const char *s;
struct ast_flags config_flags = { 0 }; struct ast_flags config_flags = { 0 };
display_callids = 1;
if (!(cfg = ast_config_load2(S_OR(altconf, "logger.conf"), "logger", config_flags)) || cfg == CONFIG_STATUS_FILEINVALID) { if (!(cfg = ast_config_load2(S_OR(altconf, "logger.conf"), "logger", config_flags)) || cfg == CONFIG_STATUS_FILEINVALID) {
cfg = NULL; cfg = NULL;
} }
/* delete our list of log channels */
if (!locked) { if (!locked) {
AST_RWLIST_WRLOCK(&logchannels); AST_RWLIST_WRLOCK(&logchannels);
} }
/* Set defaults */
hostname[0] = '\0';
display_callids = 1;
memset(&logfiles, 0, sizeof(logfiles));
logfiles.queue_log = 1;
ast_copy_string(dateformat, "%b %e %T", sizeof(dateformat));
ast_copy_string(queue_log_name, QUEUELOG, sizeof(queue_log_name));
exec_after_rotate[0] = '\0';
rotatestrategy = SEQUENTIAL;
/* delete our list of log channels */
while ((chan = AST_RWLIST_REMOVE_HEAD(&logchannels, list))) { while ((chan = AST_RWLIST_REMOVE_HEAD(&logchannels, list))) {
ast_free(chan); ast_free(chan);
} }
@@ -432,17 +441,14 @@ static int init_logger_chain(int locked, const char *altconf)
ast_copy_string(hostname, "unknown", sizeof(hostname)); ast_copy_string(hostname, "unknown", sizeof(hostname));
fprintf(stderr, "What box has no hostname???\n"); fprintf(stderr, "What box has no hostname???\n");
} }
} else }
hostname[0] = '\0'; }
} else
hostname[0] = '\0';
if ((s = ast_variable_retrieve(cfg, "general", "display_callids"))) { if ((s = ast_variable_retrieve(cfg, "general", "display_callids"))) {
display_callids = ast_true(s); display_callids = ast_true(s);
} }
if ((s = ast_variable_retrieve(cfg, "general", "dateformat"))) if ((s = ast_variable_retrieve(cfg, "general", "dateformat"))) {
ast_copy_string(dateformat, s, sizeof(dateformat)); ast_copy_string(dateformat, s, sizeof(dateformat));
else }
ast_copy_string(dateformat, "%b %e %T", sizeof(dateformat));
if ((s = ast_variable_retrieve(cfg, "general", "queue_log"))) { if ((s = ast_variable_retrieve(cfg, "general", "queue_log"))) {
logfiles.queue_log = ast_true(s); logfiles.queue_log = ast_true(s);
} }