Clean up session messages a bit

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@184 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/cache.h b/varnish-cache/bin/varnishd/cache.h
index 212bd91e9b3121596f49cc2646e3f31eb19e563e..1a273bb6150206cbf3355b9a0efcd1404a3099cb 100644 (file)
--- a/varnish-cache/bin/varnishd/cache.h
+++ b/varnish-cache/bin/varnishd/cache.h
@@ -61,7 +61,7 @@ extern struct stevedore *stevedore;
 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 */

diff --git a/varnish-cache/bin/varnishd/cache_acceptor.c b/varnish-cache/bin/varnishd/cache_acceptor.c
index 0e8988e0caff0e3d26fc307d362f9d633e3c95ce..2428c7c082e62bdc2b6baa3424eb45f7b70cc94e 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_acceptor.c
+++ b/varnish-cache/bin/varnishd/cache_acceptor.c
@@ -63,11 +63,8 @@ vca_flush(struct sess *sp)
        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 @@ vca_main(void *arg)
 /*--------------------------------------------------------------------*/
 
 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;
 }

diff --git a/varnish-cache/bin/varnishd/cache_http.c b/varnish-cache/bin/varnishd/cache_http.c
index ba45148711a0ecd6d99ae9a217e2158c1f99cee9..afd722773b44c2a53eb3f042764fa1970256ebd1 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_http.c
+++ b/varnish-cache/bin/varnishd/cache_http.c
@@ -255,10 +255,13 @@ http_read_f(int fd, short event, void *arg)
        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)

diff --git a/varnish-cache/bin/varnishd/cache_pipe.c b/varnish-cache/bin/varnishd/cache_pipe.c
index 1bdd35216e98597ae15bf48b5b8b3f312ed2ecad..cfcf7d8fd98d67eadb55ebbb98ff1fd85bb191be 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_pipe.c
+++ b/varnish-cache/bin/varnishd/cache_pipe.c
@@ -75,6 +75,6 @@ PipeSession(struct worker *w, struct sess *sp)
        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);
 }

diff --git a/varnish-cache/bin/varnishd/cache_pool.c b/varnish-cache/bin/varnishd/cache_pool.c
index 8bceb0933d0fc6beda12541cf0198e8696092c8f..b92b2733319c3fe6953a3ec4339ac999a7f61458 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_pool.c
+++ b/varnish-cache/bin/varnishd/cache_pool.c
@@ -158,8 +158,7 @@ CacheWorker(void *priv)
                }
                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 @@ DealWithSession(void *arg, int good)
        struct sess *sp = arg;
 
        if (!good) {
-               vca_close_session(sp);
+               vca_close_session(sp, "no request");
                vca_return_session(sp);
                return;
        }