Mailing List Archive

commit 4e386aefff035bb1fe533d53071262a663665cb8
Author: Dridi Boukelmoune <dridi.boukelmoune@gmail.com>
Date: Mon Dec 4 17:25:57 2023 +0100

mgt_vcl: Retire artificial formatting from vcl.list

It is the VTE's job to deal with alignment now.

diff --git a/bin/varnishd/mgt/mgt_vcl.c b/bin/varnishd/mgt/mgt_vcl.c
index 882c828aa..9c4e01e9c 100644
--- a/bin/varnishd/mgt/mgt_vcl.c
+++ b/bin/varnishd/mgt/mgt_vcl.c
@@ -849,7 +849,7 @@ mcf_vcl_list(struct cli *cli, const char * const *av, void *priv)
vp == mgt_vcl_active ? "active" : "available");
vs = vp->warm ? VCL_STATE_WARM : VCL_STATE_COLD;
VTE_printf(vte, "\t%s\t%s", vp->state->name, vs->name);
- VTE_printf(vte, "\t%6s\t%s", "-", vp->name);
+ VTE_printf(vte, "\t-\t%s", vp->name);
if (mcf_is_label(vp)) {
vd = VTAILQ_FIRST(&vp->dfrom);
AN(vd);
diff --git a/bin/varnishtest/tests/u00000.vtc b/bin/varnishtest/tests/u00000.vtc
index 63df292be..8b1e9de32 100644
--- a/bin/varnishtest/tests/u00000.vtc
+++ b/bin/varnishtest/tests/u00000.vtc
@@ -108,7 +108,7 @@ shell -expect {VCL 'vcl1' now active} {
varnishadm -n ${tmpdir}/v1 vcl.use vcl1
}

-shell -expect {active auto warm - vcl1} {
+shell -expect {active auto warm - vcl1} {
varnishadm -n ${tmpdir}/v1 vcl.list
}

_______________________________________________
varnish-commit mailing list
varnish-commit@varnish-cache.org
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit