I don't care what anyone says, this change is going into 1.6.0.

Otherwise, the simple act of logging an agent in spams the CLI
with warning messages about failed reads of the alertpipe.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@159314 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Mark Michelson 17 years ago
parent 1c6382e638
commit 0ecfb8e29e

@ -2437,9 +2437,11 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio)
} }
} }
if (read(chan->alertpipe[0], &blah, sizeof(blah)) < 0) { if (read(chan->alertpipe[0], &blah, sizeof(blah)) < 0) {
if (errno != EINTR && errno != EAGAIN) {
ast_log(LOG_WARNING, "read() failed: %s\n", strerror(errno)); ast_log(LOG_WARNING, "read() failed: %s\n", strerror(errno));
} }
} }
}
#ifdef HAVE_DAHDI #ifdef HAVE_DAHDI
if (chan->timingfd > -1 && chan->fdno == AST_TIMING_FD && ast_test_flag(chan, AST_FLAG_EXCEPTION)) { if (chan->timingfd > -1 && chan->fdno == AST_TIMING_FD && ast_test_flag(chan, AST_FLAG_EXCEPTION)) {

Loading…
Cancel
Save