summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Murphy <murf@digium.com>2008-11-05 16:11:11 +0000
committerSteve Murphy <murf@digium.com>2008-11-05 16:11:11 +0000
commitf7c20e0dec4a485961906b56fecb402361b32139 (patch)
treee2fea049cf1df2b18d7bd555aad5d4f11f994b6a
parent990a6bebe8a69146b4c7fe8c522d45790190d4e0 (diff)
Merged revisions 154685 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r154685 | murf | 2008-11-05 09:06:53 -0700 (Wed, 05 Nov 2008) | 1 line This fix was prompted by communication from user, who was seeing thousands of error logs... looks like EAGAIN. Made such uninteresting. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@154687 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--main/channel.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c
index 34733af54..ec253ae04 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -2442,7 +2442,8 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio)
}
}
if (read(chan->alertpipe[0], &blah, sizeof(blah)) < 0) {
- ast_log(LOG_WARNING, "read() failed: %s\n", strerror(errno));
+ if (errno != EINTR && errno != EAGAIN)
+ ast_log(LOG_WARNING, "read() failed: %s\n", strerror(errno));
}
}