Merged revisions 307092 via svnmerge from
authorJason Parker <jparker@digium.com>
Tue, 8 Feb 2011 21:24:57 +0000 (21:24 +0000)
committerJason Parker <jparker@digium.com>
Tue, 8 Feb 2011 21:24:57 +0000 (21:24 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r307092 | qwell | 2011-02-08 15:24:01 -0600 (Tue, 08 Feb 2011) | 9 lines

  Fix issue with verbose messages not showing on remote console.

  This code was reworked recently, and since the logchannel list hadn't been
  created yet at this point, and it was a verbose message, it was being dropped
  on the floor.  Now it'll continue on to where it should be handled.

  (closes issue #18580)
  Reported by: pabelanger
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@307097 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/logger.c

index f903295..63facaa 100644 (file)
@@ -1103,20 +1103,18 @@ void ast_log(int level, const char *file, int line, const char *function, const
        if (!(buf = ast_str_thread_get(&log_buf, LOG_BUF_INIT_SIZE)))
                return;
 
-       if (AST_RWLIST_EMPTY(&logchannels)) {
+       if (level != __LOG_VERBOSE && AST_RWLIST_EMPTY(&logchannels)) {
                /*
                 * we don't have the logger chain configured yet,
                 * so just log to stdout
                 */
-               if (level != __LOG_VERBOSE) {
-                       int result;
-                       va_start(ap, fmt);
-                       result = ast_str_set_va(&buf, BUFSIZ, fmt, ap); /* XXX BUFSIZ ? */
-                       va_end(ap);
-                       if (result != AST_DYNSTR_BUILD_FAILED) {
-                               term_filter_escapes(ast_str_buffer(buf));
-                               fputs(ast_str_buffer(buf), stdout);
-                       }
+               int result;
+               va_start(ap, fmt);
+               result = ast_str_set_va(&buf, BUFSIZ, fmt, ap); /* XXX BUFSIZ ? */
+               va_end(ap);
+               if (result != AST_DYNSTR_BUILD_FAILED) {
+                       term_filter_escapes(ast_str_buffer(buf));
+                       fputs(ast_str_buffer(buf), stdout);
                }
                return;
        }