Change the layout of the "vcl.list" to explicitly say "active",

"available" or "discarded".

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

diff --git a/varnish-cache/bin/varnishd/cache_vcl.c b/varnish-cache/bin/varnishd/cache_vcl.c
index 491f4921fd85a94b877497b6634a11c3259fcf71..3c874881f117ce7f241748a0b19d337a547bf66a 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_vcl.c
+++ b/varnish-cache/bin/varnishd/cache_vcl.c
@@ -214,13 +214,20 @@ static void
 ccf_config_list(struct cli *cli, const char * const *av, void *priv)
 {
        struct vcls *vcl;
+       const char *flg;
 
        (void)av;
        (void)priv;
        ASSERT_CLI();
        VTAILQ_FOREACH(vcl, &vcl_head, list) {
-               cli_out(cli, "%s %6u %s\n",
-                   vcl == vcl_active ? "* " : "  ",
+               if (vcl == vcl_active) {
+                       flg = "active";
+               } else if (vcl->conf->discard) {
+                       flg = "discarded";
+               } else
+                       flg = "available";
+               cli_out(cli, "%-10s %6u %s\n",
+                   flg,
                    vcl->conf->busy,
                    vcl->name);
        }