r2491 - trunk/varnish-cache/bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2008-02-16 12:03:37 +0100 (Sat, 16 Feb 2008)
New Revision: 2491

Modified:
   trunk/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c
Log:
We may get spurious events on an unclosed fd as well.  It won't cause
any harm, but I still want to catch it early so we get a log entry for
it.


Modified: trunk/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c	2008-02-15 14:22:23 UTC (rev 2490)
+++ trunk/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c	2008-02-16 11:03:37 UTC (rev 2491)
@@ -221,9 +221,9 @@
 #endif
 	spassert(sp->id == kp->ident);
 	spassert(sp->fd == sp->id || sp->fd == -1);
-	if (sp->fd == -1) {
-		VSL(SLT_Debug, sp->id, "%s(): got event 0x%04x on closed fd",
-		    __func__, kp->fflags);
+	if (sp->fd == -1 || kp->fflags == 0) {
+		VSL(SLT_Debug, sp->id, "%s(): got event 0x%04x on fd %d",
+		    __func__, kp->fflags, sp->fd);
 		return;
 	}
 	if (kp->data > 0) {