r1164 - in branches/1.0: . bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2006-10-18 16:26:48 +0200 (Wed, 18 Oct 2006)
New Revision: 1164

Modified:
   branches/1.0/
   branches/1.0/bin/varnishd/cache_acceptor.c
Log:
 r31756 at cat (orig r1125):  des | 2006-09-26 15:10:36 +0200
 Ignore accept() failures if errno is EAGAIN - this is not likely to happen
 on a production server, but it will on a test rig, and it may confuse and
 alarm the admin.



Property changes on: branches/1.0
___________________________________________________________________
Name: svk:merge
   - d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1124
   + d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1125

Modified: branches/1.0/bin/varnishd/cache_acceptor.c
===================================================================
--- branches/1.0/bin/varnishd/cache_acceptor.c	2006-10-18 14:26:47 UTC (rev 1163)
+++ branches/1.0/bin/varnishd/cache_acceptor.c	2006-10-18 14:26:48 UTC (rev 1164)
@@ -157,9 +157,11 @@
 		l = sizeof addr;
 		i = accept(heritage.socket, addr, &l);
 		if (i < 0) {
-			VSL(SLT_Debug, heritage.socket,
-			    "Accept failed errno=%d", errno);
-			/* XXX: stats ? */
+			if (errno != EAGAIN) {
+				VSL(SLT_Debug, heritage.socket,
+				    "Accept failed errno=%d", errno);
+				/* XXX: stats ? */
+			}
 			continue;
 		}
 		sp = SES_New(addr, l);