[master] a06095da1 fix vcl temperature panic output
Nils Goroll
nils.goroll at uplex.de
Sat Jan 18 12:31:07 UTC 2020
commit a06095da13188d919a403fcab8c7bff8a9e61997
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Sat Jan 18 13:28:33 2020 +0100
fix vcl temperature panic output
When we turned the vcl temperatures into a struct, we overlooked this
statement because of the cast.
Noticed when staring at #3192
diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index 5eed51733..3299fd06c 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -222,7 +222,7 @@ VCL_Panic(struct vsb *vsb, const char *nm, const struct vcl *vcl)
VSB_printf(vsb, "busy = %u,\n", vcl->busy);
VSB_printf(vsb, "discard = %u,\n", vcl->discard);
VSB_printf(vsb, "state = %s,\n", vcl->state);
- VSB_printf(vsb, "temp = %s,\n", (const volatile char *)vcl->temp);
+ VSB_printf(vsb, "temp = %s,\n", vcl->temp ? vcl->temp->name : "(null)");
VSB_cat(vsb, "conf = {\n");
VSB_indent(vsb, 2);
if (vcl->conf == NULL) {
More information about the varnish-commit
mailing list