diff options
author | George Joseph <george.joseph@fairview5.com> | 2015-05-20 18:05:20 -0600 |
---|---|---|
committer | George Joseph <george.joseph@fairview5.com> | 2015-05-20 18:05:20 -0600 |
commit | 7fcf0a97b897c958de83ee49fe403c52c8a5d3ed (patch) | |
tree | 7b2e815dce1a99a353eccca00db7cd185a5f30d8 | |
parent | 4a450f863b6330c653b08261660dfce4a6ba3403 (diff) |
app_playback: Suppress warnings on playback if channel hung up
If a channel hangs up while an audio file is playing, there's
no need to clutter up the logs with a warning so suppress it
if ast_check_hangup returns true.
Also, change warning to debug/2 in file.c if writing a frame
fails. Same reasoning.
Change-Id: I2e66191af3c5b6e951c98e8f1c3fe3cf2cf7ed89
Reported-by: George Joseph <george.joseph@fairview5.com>
Tested-by: George Joseph <george.joseph@fairview5.com>
-rw-r--r-- | apps/app_playback.c | 4 | ||||
-rw-r--r-- | main/file.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/apps/app_playback.c b/apps/app_playback.c index 678757319..e5df79445 100644 --- a/apps/app_playback.c +++ b/apps/app_playback.c @@ -490,7 +490,9 @@ static int playback_exec(struct ast_channel *chan, const char *data) ast_stopstream(chan); } if (res) { - ast_log(LOG_WARNING, "Playback failed on %s for %s\n", ast_channel_name(chan), (char *)data); + if (!ast_check_hangup(chan)) { + ast_log(LOG_WARNING, "Playback failed on %s for %s\n", ast_channel_name(chan), (char *)data); + } res = 0; mres = 1; } diff --git a/main/file.c b/main/file.c index b0d5011cf..64406bf85 100644 --- a/main/file.c +++ b/main/file.c @@ -902,7 +902,7 @@ static enum fsread_res ast_readaudio_callback(struct ast_filestream *s) if (!fr /* stream complete */ || ast_write(s->owner, fr) /* error writing */) { if (fr) { - ast_log(LOG_WARNING, "Failed to write frame\n"); + ast_debug(2, "Failed to write frame\n"); ast_frfree(fr); } goto return_failure; @@ -959,7 +959,7 @@ static enum fsread_res ast_readvideo_callback(struct ast_filestream *s) if (!fr /* stream complete */ || ast_write(s->owner, fr) /* error writing */) { if (fr) { - ast_log(LOG_WARNING, "Failed to write frame\n"); + ast_debug(2, "Failed to write frame\n"); ast_frfree(fr); } ast_channel_vstreamid_set(s->owner, -1); |