From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Wed, 24 Feb 2010 21:29:23 +0000 (+0000)
Subject: Merged revisions 248584 via svnmerge from
X-Git-Tag: 1.6.1.18-rc1~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c25b47698dace69360303337da881b97d8696b82;p=thirdparty%2Fasterisk.git

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
  ........
................


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

diff --git a/main/logger.c b/main/logger.c
index d9d45472e1..3dd8139383 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -905,12 +905,13 @@ static void logger_print_normal(struct logmsg *logmsg)
 				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)