summaryrefslogtreecommitdiff
path: root/main/logger.c
diff options
context:
space:
mode:
authorKevin Harwell <kharwell@digium.com>2013-08-29 22:49:24 +0000
committerKevin Harwell <kharwell@digium.com>2013-08-29 22:49:24 +0000
commitd7b9a702d8c3705bf6c736d2df166f51981fc006 (patch)
tree157c81027e5ef9a22f61e17ac43b574b063055ec /main/logger.c
parent8990924953be29d679de2b373e47d680e04ba85b (diff)
Verbose logging discrepancies
Refactored cases where a combination of ast_verbose/options_verbose were present. Also in general tried to eliminate, in as many places as possible, where the options_verbose global variable was being used. Refactored the way local and remote consoles handle verbose message logging in an attempt to solve the various discrepancies that sometimes would show between the two. (closes issue AST-1193) Reported by: Guenther Kelleter Review: https://reviewboard.asterisk.org/r/2798/ ........ Merged revisions 397948 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 397958 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@397959 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/logger.c')
-rw-r--r--main/logger.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/main/logger.c b/main/logger.c
index c374d2e57..06f8d4584 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -1552,7 +1552,11 @@ void ast_log(int level, const char *file, int line, const char *function, const
callid = ast_read_threadstorage_callid();
va_start(ap, fmt);
- ast_log_full(level, file, line, function, callid, fmt, ap);
+ if (level == __LOG_VERBOSE) {
+ __ast_verbose_ap(file, line, function, 0, callid, fmt, ap);
+ } else {
+ ast_log_full(level, file, line, function, callid, fmt, ap);
+ }
va_end(ap);
if (callid) {
@@ -1826,4 +1830,3 @@ void ast_logger_unregister_level(const char *name)
AST_RWLIST_UNLOCK(&logchannels);
}
}
-