[master] 70977c91c param: New "all" counterpart to "none" for vsl_mask
Dridi Boukelmoune
dridi.boukelmoune at gmail.com
Tue Nov 21 06:03:09 UTC 2023
commit 70977c91c47117809bbc8ce89bdb12e083b756a8
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date: Tue Nov 7 07:25:08 2023 +0100
param: New "all" counterpart to "none" for vsl_mask
diff --git a/bin/varnishd/mgt/mgt_param_tweak.c b/bin/varnishd/mgt/mgt_param_tweak.c
index 0c5301b83..bfd0f2bee 100644
--- a/bin/varnishd/mgt/mgt_param_tweak.c
+++ b/bin/varnishd/mgt/mgt_param_tweak.c
@@ -680,6 +680,8 @@ tweak_generic_bits(struct vsb *vsb, const struct parspec *par, const char *arg,
if (arg != NULL && arg != JSON_FMT) {
if (sign == '+' && !strcmp(arg, "none"))
bit_clear(p, l);
+ else if (sign == '-' && !strcmp(arg, "all"))
+ bit_clear(p, l);
else
return (bit_tweak(vsb, p, l, arg, tags, desc, sign));
} else {
@@ -693,7 +695,7 @@ tweak_generic_bits(struct vsb *vsb, const struct parspec *par, const char *arg,
}
}
if (*s == '\0')
- VSB_cat(vsb, sign == '+' ? "none" : "(all enabled)");
+ VSB_cat(vsb, sign == '+' ? "none" : "all");
if (arg == JSON_FMT)
VSB_putc(vsb, '"');
}
diff --git a/bin/varnishtest/tests/c00054.vtc b/bin/varnishtest/tests/c00054.vtc
index 6730a6baa..63aef00a1 100644
--- a/bin/varnishtest/tests/c00054.vtc
+++ b/bin/varnishtest/tests/c00054.vtc
@@ -9,6 +9,7 @@ varnish v1 -cliok "param.set vsl_mask +WorkThread,+TTL,+Hash"
varnish v1 -cliok "param.show vsl_mask"
varnish v1 -cliexpect {"value": "none"} "param.set -j feature none"
+varnish v1 -cliexpect {"value": "all"} "param.set -j vsl_mask all"
varnish v1 -clierr 106 "param.set vsl_mask FooBar"
varnish v1 -clierr 106 "param.set vsl_mask -FooBar"
diff --git a/include/tbl/params.h b/include/tbl/params.h
index 073e5be3b..de16b146e 100644
--- a/include/tbl/params.h
+++ b/include/tbl/params.h
@@ -1881,6 +1881,7 @@ PARAM_BITS(
"-WorkThread",
/* descr */
"Mask individual VSL messages from being logged.\n"
+ "\tall\tEnable all tags\n"
"\tdefault\tSet default value\n"
"\nUse +/- prefix in front of VSL tag name to unmask/mask "
"individual VSL messages.")
More information about the varnish-commit
mailing list