[asterisk-commits] murf: branch 1.6.1 r154690 - in /branches/1.6.1: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: murf
Date: Wed Nov  5 10:14:20 2008
New Revision: 154690

URL: http://svn.digium.com/view/asterisk?view=rev&rev=154690
Log:
Merged revisions 154687 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r154687 | murf | 2008-11-05 09:11:11 -0700 (Wed, 05 Nov 2008) | 9 lines

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

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/channel.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/channel.c?view=diff&rev=154690&r1=154689&r2=154690
==============================================================================
--- branches/1.6.1/main/channel.c (original)
+++ branches/1.6.1/main/channel.c Wed Nov  5 10:14:20 2008
@@ -2425,7 +2425,8 @@
 			}
 		}
 		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));
 		}
 	}