[asterisk-commits] tilghman: branch 1.6.1 r248641 - in /branches/1.6.1: ./ main/logger.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Feb 24 15:29:23 2010
New Revision: 248641

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=248641
Log:
Merged revisions 248584 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r248584 | tilghman | 2010-02-24 15:17:26 -0600 (Wed, 24 Feb 2010) | 14 lines
  
  Merged revisions 248582 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r248582 | tilghman | 2010-02-24 15:02:18 -0600 (Wed, 24 Feb 2010) | 7 lines
    
    Remove color code sequences from verbose messages that go to logfiles.
    (closes issue #16786)
     Reported by: dodo
     Patches: 
           logger2.patch uploaded by dodo (license 989)
     Tested by: tilghman
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/logger.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/logger.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/logger.c?view=diff&rev=248641&r1=248640&r2=248641
==============================================================================
--- branches/1.6.1/main/logger.c (original)
+++ branches/1.6.1/main/logger.c Wed Feb 24 15:29:23 2010
@@ -905,12 +905,13 @@
 				int res = 0;
 
 				/* If no file pointer exists, skip it */
-				if (!chan->fileptr)
+				if (!chan->fileptr) {
 					continue;
-				
+				}
+
 				/* Print out to the file */
 				res = fprintf(chan->fileptr, "[%s] %s[%ld] %s: %s",
-					      logmsg->date, levels[logmsg->level], logmsg->process_id, logmsg->file, logmsg->str);
+					      logmsg->date, levels[logmsg->level], logmsg->process_id, logmsg->file, term_strip(buf, logmsg->str, BUFSIZ));
 				if (res <= 0 && !ast_strlen_zero(logmsg->str)) {
 					fprintf(stderr, "**** Asterisk Logging Error: ***********\n");
 					if (errno == ENOMEM || errno == ENOSPC)