diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-24 21:23:35 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-24 21:23:35 +0000 |
commit | 0fbde73a7a367cba1c38556d6e747cf837c19080 (patch) | |
tree | 4670566e729cbfa5d880d23f75a2bc8c11bc5a0c | |
parent | d0b09fe20cd0b3ec2cbaa3bea861b32e470b6445 (diff) |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@248613 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | main/logger.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/main/logger.c b/main/logger.c index ca29d2ace..42bc0d84e 100644 --- a/main/logger.c +++ b/main/logger.c @@ -817,12 +817,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) |