[master] 12a8790 Panic reporting of backend health is a director function

Poul-Henning Kamp phk at FreeBSD.org
Mon Apr 23 22:06:22 UTC 2018


commit 12a87903f0761d4de4f013b671d05d8fc4b18911
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Apr 23 20:32:37 2018 +0000

    Panic reporting of backend health is a director function

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index acef648..610132a 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -413,11 +413,6 @@ vbe_panic(const struct director *d, struct vsb *vsb)
 		VSB_printf(vsb, "ipv6 = %s,\n", bp->ipv6_addr);
 	VSB_printf(vsb, "port = %s,\n", bp->port);
 	VSB_printf(vsb, "hosthdr = %s,\n", bp->hosthdr);
-	VSB_printf(vsb, "health = %s,\n",
-	    bp->director->health ? "healthy" : "sick");
-	VSB_printf(vsb, "admin_health = %s, changed = %f,\n",
-	    VDI_Ahealth(bp->director),
-	    bp->director->health_changed);
 	VSB_printf(vsb, "n_conn = %u,\n", bp->n_conn);
 }
 
diff --git a/bin/varnishd/cache/cache_director.c b/bin/varnishd/cache/cache_director.c
index 30ae727..3b6e4b7 100644
--- a/bin/varnishd/cache/cache_director.c
+++ b/bin/varnishd/cache/cache_director.c
@@ -244,6 +244,9 @@ VDI_Panic(const struct director *d, struct vsb *vsb, const char *nm)
 	VSB_printf(vsb, "%s = %p {\n", nm, d);
 	VSB_indent(vsb, 2);
 	VSB_printf(vsb, "vcl_name = %s,\n", d->vcl_name);
+	VSB_printf(vsb, "health = %s,\n", d->health ?  "healthy" : "sick");
+	VSB_printf(vsb, "admin_health = %s, changed = %f,\n",
+	    VDI_Ahealth(d), d->health_changed);
 	VSB_printf(vsb, "type = %s {\n", d->name);
 	VSB_indent(vsb, 2);
 	if (d->panic != NULL)


More information about the varnish-commit mailing list