[svn-commits] qwell: trunk r307097 - in /trunk: ./ main/logger.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Tue Feb  8 15:24:57 2011
New Revision: 307097

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=307097
Log:
Merged revisions 307092 via svnmerge from 
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
........

Modified:
    trunk/   (props changed)
    trunk/main/logger.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/logger.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/logger.c?view=diff&rev=307097&r1=307096&r2=307097
==============================================================================
--- trunk/main/logger.c (original)
+++ trunk/main/logger.c Tue Feb  8 15:24:57 2011
@@ -1103,20 +1103,18 @@
 	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;
 	}