r2441 - trunk/varnish-cache/bin/varnishd
phk at projects.linpro.no
phk at projects.linpro.no
Thu Feb 7 10:53:28 CET 2008
Author: phk
Date: 2008-02-07 10:53:28 +0100 (Thu, 07 Feb 2008)
New Revision: 2441
Modified:
trunk/varnish-cache/bin/varnishd/cache_backend.c
Log:
Emit the vcl_name from the backend host.
Modified: trunk/varnish-cache/bin/varnishd/cache_backend.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_backend.c 2008-02-07 09:52:26 UTC (rev 2440)
+++ trunk/varnish-cache/bin/varnishd/cache_backend.c 2008-02-07 09:53:28 UTC (rev 2441)
@@ -51,7 +51,6 @@
struct backend {
unsigned magic;
#define BACKEND_MAGIC 0x64c4c7c6
- char *vcl_name;
struct vrt_backend vrt[1];
@@ -124,7 +123,7 @@
TCP_name((void*)&ss, alen,
abuf2, sizeof abuf2, pbuf2, sizeof pbuf2);
WSL(sp->wrk, SLT_BackendOpen, s, "%s %s %s %s %s",
- sp->backend->vcl_name, abuf1, pbuf1, abuf2, pbuf2);
+ sp->backend->vrt->vcl_name, abuf1, pbuf1, abuf2, pbuf2);
LOCK(&sp->backend->mtx);
return (s);
@@ -399,7 +398,7 @@
CHECK_OBJ_NOTNULL(vc->backend, BACKEND_MAGIC);
b = vc->backend;
assert(vc->fd >= 0);
- WSL(w, SLT_BackendClose, vc->fd, "%s", vc->backend->vcl_name);
+ WSL(w, SLT_BackendClose, vc->fd, "%s", vc->backend->vrt->vcl_name);
i = close(vc->fd);
assert(i == 0 || errno == ECONNRESET || errno == ENOTCONN);
vc->fd = -1;
@@ -420,7 +419,7 @@
CHECK_OBJ_NOTNULL(vc->backend, BACKEND_MAGIC);
assert(vc->fd >= 0);
bp = vc->backend;
- WSL(w, SLT_BackendReuse, vc->fd, "%s", vc->backend->vcl_name);
+ WSL(w, SLT_BackendReuse, vc->fd, "%s", vc->backend->vrt->vcl_name);
LOCK(&vc->backend->mtx);
VSL_stats->backend_recycle++;
VTAILQ_INSERT_HEAD(&bp->connlist, vc, list);
@@ -540,6 +539,8 @@
XXXAN(b->vrt->hostname);
b->vrt->portname = strdup(vb->portname);
XXXAN(b->vrt->portname);
+ b->vrt->vcl_name = strdup(vb->vcl_name);
+ XXXAN(b->vrt->vcl_name);
MTX_INIT(&b->mtx);
b->refcount = 1;
More information about the varnish-commit
mailing list