r184 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2006-06-14 11:25:13 +0200 (Wed, 14 Jun 2006)
New Revision: 184

Modified:
   trunk/varnish-cache/bin/varnishd/cache.h
   trunk/varnish-cache/bin/varnishd/cache_acceptor.c
   trunk/varnish-cache/bin/varnishd/cache_http.c
   trunk/varnish-cache/bin/varnishd/cache_pipe.c
   trunk/varnish-cache/bin/varnishd/cache_pool.c
Log:
Clean up session messages a bit


Modified: trunk/varnish-cache/bin/varnishd/cache.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache.h	2006-06-14 09:23:50 UTC (rev 183)
+++ trunk/varnish-cache/bin/varnishd/cache.h	2006-06-14 09:25:13 UTC (rev 184)
@@ -61,7 +61,7 @@
 void vca_write(struct sess *sp, void *ptr, size_t len);
 void vca_flush(struct sess *sp);
 void vca_return_session(struct sess *sp);
-void vca_close_session(struct sess *sp);
+void vca_close_session(struct sess *sp, const char *why);
 void VCA_Init(void);
 
 /* cache_backend.c */

Modified: trunk/varnish-cache/bin/varnishd/cache_acceptor.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_acceptor.c	2006-06-14 09:23:50 UTC (rev 183)
+++ trunk/varnish-cache/bin/varnishd/cache_acceptor.c	2006-06-14 09:25:13 UTC (rev 184)
@@ -63,11 +63,8 @@
 	if (sp->fd < 0 || sp->mem->niov == 0)
 		return;
 	i = writev(sp->fd, sp->mem->iov, sp->mem->niov);
-	if (i != sp->mem->liov) {
-		VSL(SLT_SessionClose, sp->fd, "Premature %d of %d",
-		    i,  sp->mem->liov);
-		vca_close_session(sp);
-	}
+	if (i != sp->mem->liov)
+		vca_close_session(sp, "remote closed");
 	sp->mem->liov = 0;
 	sp->mem->niov = 0;
 }
@@ -180,10 +177,10 @@
 /*--------------------------------------------------------------------*/
 
 void
-vca_close_session(struct sess *sp)
+vca_close_session(struct sess *sp, const char *why)
 {
 
-	VSL(SLT_SessionClose, sp->fd, "%s", sp->addr);
+	VSL(SLT_SessionClose, sp->fd, why);
 	close(sp->fd);
 	sp->fd = -1;
 }

Modified: trunk/varnish-cache/bin/varnishd/cache_http.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_http.c	2006-06-14 09:23:50 UTC (rev 183)
+++ trunk/varnish-cache/bin/varnishd/cache_http.c	2006-06-14 09:25:13 UTC (rev 184)
@@ -255,10 +255,13 @@
 	i = read(fd, hp->v, hp->e - hp->v);
 	if (i <= 0) {
 		if (hp->v != hp->s)
-			VSL(SLT_SessionClose, fd,
-			    "remote had %d bytes errno %d", hp->v - hp->s, errno);
+			VSL(SLT_HttpError, fd,
+			    "Received (only) %d bytes, errno %d",
+			    hp->v - hp->s, errno);
+		else if (errno == 0)
+			VSL(SLT_HttpError, fd, "Received nothing");
 		else
-			VSL(SLT_SessionClose, fd, "remote errno %d", errno);
+			VSL(SLT_HttpError, fd, "Received errno %d", errno);
 		hp->t = NULL;
 		event_del(&hp->ev);
 		if (hp->callback != NULL)

Modified: trunk/varnish-cache/bin/varnishd/cache_pipe.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_pipe.c	2006-06-14 09:23:50 UTC (rev 183)
+++ trunk/varnish-cache/bin/varnishd/cache_pipe.c	2006-06-14 09:25:13 UTC (rev 184)
@@ -75,6 +75,6 @@
 	event_add(&e2.ev, NULL);
 	event_base_loop(w->eb, 0);
 	close (fd);
-	vca_close_session(sp);
+	vca_close_session(sp, "pipe");
 	VBE_ClosedFd(fd_token);
 }

Modified: trunk/varnish-cache/bin/varnishd/cache_pool.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_pool.c	2006-06-14 09:23:50 UTC (rev 183)
+++ trunk/varnish-cache/bin/varnishd/cache_pool.c	2006-06-14 09:25:13 UTC (rev 184)
@@ -158,8 +158,7 @@
 		}
 		if (http_GetHdr(sp->http, "Connection", &b) &&
 		    !strcmp(b, "close")) {
-			VSL(SLT_SessionClose, sp->fd, "hdr");
-			vca_close_session(sp);
+			vca_close_session(sp, "Connection header");
 		}
 
 		AZ(pthread_mutex_lock(&sessmtx));
@@ -175,7 +174,7 @@
 	struct sess *sp = arg;
 
 	if (!good) {
-		vca_close_session(sp);
+		vca_close_session(sp, "no request");
 		vca_return_session(sp);
 		return;
 	}