kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 00:24:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "logger: Always enable verbose for console channel."

Browse Source
This commit is contained in:
Joshua Colp
2016-09-21 14:35:27 -05:00
committed by Gerrit Code Review
parent ccc0bfa69c 00f1d05d34
commit 57b29f3b69
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/asterisk.c
View File

@@ -4482,7 +4482,6 @@ static void asterisk_daemon(int isroot, const char *runuser, const char *rungrou
check_init(ast_format_cache_init(), "Format Cache"); check_init(ast_format_cache_init(), "Format Cache");
check_init(ast_codec_builtin_init(), "Built-in Codecs"); check_init(ast_codec_builtin_init(), "Built-in Codecs");
check_init(aco_init(), "Configuration Option Framework"); check_init(aco_init(), "Configuration Option Framework");
check_init(init_logger(), "Logger");
check_init(ast_bucket_init(), "Bucket API"); check_init(ast_bucket_init(), "Bucket API");
check_init(stasis_init(), "Stasis"); check_init(stasis_init(), "Stasis");
check_init(ast_stasis_system_init(), "Stasis system-level information"); check_init(ast_stasis_system_init(), "Stasis system-level information");
@@ -4512,6 +4511,7 @@ static void asterisk_daemon(int isroot, const char *runuser, const char *rungrou
threadstorage_init(); threadstorage_init();
check_init(init_logger(), "Logger");
check_init(ast_rtp_engine_init(), "RTP Engine"); check_init(ast_rtp_engine_init(), "RTP Engine");
ast_autoservice_init(); ast_autoservice_init();

4
main/logger.c
View File

@@ -479,6 +479,7 @@ static void make_components(struct logchannel *chan)
* with calculating the ast_verb_sys_level value. * with calculating the ast_verb_sys_level value.
*/ */
chan->verbosity = -1; chan->verbosity = -1;
logmask |= (1 << __LOG_VERBOSE);
} else { } else {
chan->verbosity = verb_level; chan->verbosity = verb_level;
} }
@@ -663,7 +664,8 @@ static int init_logger_chain(const char *altconf)
return -1; return -1;
} }
chan->type = LOGTYPE_CONSOLE; chan->type = LOGTYPE_CONSOLE;
chan->logmask = (1 << __LOG_WARNING) | (1 << __LOG_NOTICE) | (1 << __LOG_ERROR); chan->logmask = (1 << __LOG_WARNING) | (1 << __LOG_NOTICE) | (1 << __LOG_ERROR)
| (1 << __LOG_VERBOSE);
memcpy(&chan->formatter, &logformatter_default, sizeof(chan->formatter)); memcpy(&chan->formatter, &logformatter_default, sizeof(chan->formatter));
AST_RWLIST_INSERT_HEAD(&logchannels, chan, list); AST_RWLIST_INSERT_HEAD(&logchannels, chan, list);