[master] dc1df48ff VIP16: retire parameters aliases
Nils Goroll
nils.goroll at uplex.de
Mon Nov 19 14:14:14 UTC 2018
commit dc1df48ffe9c3f5ba9bc61cf959d23f233a7a605
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Mon Nov 19 15:08:36 2018 +0100
VIP16: retire parameters aliases
Ref: #2830
diff --git a/bin/varnishd/mgt/mgt_param_tbl.c b/bin/varnishd/mgt/mgt_param_tbl.c
index 2bd7bb92e..46f462b14 100644
--- a/bin/varnishd/mgt/mgt_param_tbl.c
+++ b/bin/varnishd/mgt/mgt_param_tbl.c
@@ -55,12 +55,6 @@ struct parspec mgt_parspec[] = {
"and %o will be replaced with the output file name.",
MUST_RELOAD,
VCC_CC , NULL },
- { "vcl_dir", tweak_string, &mgt_vcl_path,
- NULL, NULL,
- "Old name for vcl_path, use that instead.",
- 0,
- VARNISH_VCL_DIR,
- NULL },
{ "vcl_path", tweak_string, &mgt_vcl_path,
NULL, NULL,
"Directory (or colon separated list of directories) "
@@ -73,12 +67,6 @@ struct parspec mgt_parspec[] = {
0,
VARNISH_VCL_DIR,
NULL },
- { "vmod_dir", tweak_string, &mgt_vmod_path,
- NULL, NULL,
- "Old name for vmod_path, use that instead.",
- 0,
- VARNISH_VMOD_DIR,
- NULL },
{ "vmod_path", tweak_string, &mgt_vmod_path,
NULL, NULL,
"Directory (or colon separated list of directories) "
@@ -146,12 +134,6 @@ struct parspec mgt_parspec[] = {
MEMPOOL_TEXT,
0,
"10,100,10", ""},
- { "shm_reclen", tweak_vsl_reclen, &mgt_param.vsl_reclen,
- "16b", NULL,
- "Old name for vsl_reclen, use that instead.",
- 0,
- "255b",
- "bytes" },
{ NULL, NULL, NULL }
};
diff --git a/bin/varnishd/mgt/mgt_param_tweak.c b/bin/varnishd/mgt/mgt_param_tweak.c
index 01cab5f6b..6900f4e5f 100644
--- a/bin/varnishd/mgt/mgt_param_tweak.c
+++ b/bin/varnishd/mgt/mgt_param_tweak.c
@@ -340,7 +340,6 @@ tweak_vsl_buffer(struct vsb *vsb, const struct parspec *par, const char *arg)
return (-1);
*d1 = dest;
MCF_ParamConf(MCF_MAXIMUM, "vsl_reclen", "%u", *d1 - 12);
- MCF_ParamConf(MCF_MAXIMUM, "shm_reclen", "%u", *d1 - 12);
return (0);
}
diff --git a/bin/varnishtest/tests/m00003.vtc b/bin/varnishtest/tests/m00003.vtc
index f0b312053..e2f6dccab 100644
--- a/bin/varnishtest/tests/m00003.vtc
+++ b/bin/varnishtest/tests/m00003.vtc
@@ -18,7 +18,7 @@ varnish v1 -errvcl {Could not load VMOD std} {
import std;
}
-varnish v1 -cliok "param.set vmod_dir ${topbuild}/lib/libvmod_std/.libs/"
+varnish v1 -cliok "param.set vmod_path ${topbuild}/lib/libvmod_std/.libs/"
varnish v1 -vcl+backend {
import std;
diff --git a/bin/varnishtest/tests/r02307.vtc b/bin/varnishtest/tests/r02307.vtc
deleted file mode 100644
index a86fe6d2f..000000000
--- a/bin/varnishtest/tests/r02307.vtc
+++ /dev/null
@@ -1,4 +0,0 @@
-varnishtest "shm_reclen alias for vsl_reclen"
-
-varnish v1 -cli "param.set shm_reclen 42"
-varnish v1 -cliexpect 42b "param.show vsl_reclen"
diff --git a/doc/changes.rst b/doc/changes.rst
index 82bdc813b..a3d500a28 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -103,6 +103,11 @@ Varnish Cache trunk (ongoing)
* Varnish-based tools using the VUT interface should now consider
using the ``VUT_Usage()`` function for consistency
+* retired long deprecated parameters (VIP16_). Replacement mapping is:
+ ``shm_reclen`` -> ``vsl_reclen``
+ ``vcl_dir`` -> ``vcl_path``
+ ``vmod_dir`` -> ``vmod_path``
+
.. _2809: https://github.com/varnishcache/varnish-cache/issues/2809
.. _2820: https://github.com/varnishcache/varnish-cache/issues/2820
.. _2815: https://github.com/varnishcache/varnish-cache/issues/2815
@@ -117,6 +122,7 @@ Varnish Cache trunk (ongoing)
.. _2418: https://github.com/varnishcache/varnish-cache/issues/2418
.. _2788: https://github.com/varnishcache/varnish-cache/issues/2788
.. _2790: https://github.com/varnishcache/varnish-cache/issues/2790
+.. _VIP16: https://github.com/varnishcache/varnish-cache/wiki/VIP16%3A-Retire-parameters-aliases
================================
Varnish Cache 6.1.0 (2018-09-17)
diff --git a/include/tbl/params.h b/include/tbl/params.h
index d9f27c99e..c60b48e2b 100644
--- a/include/tbl/params.h
+++ b/include/tbl/params.h
@@ -1040,23 +1040,6 @@ PARAM(
)
#undef XYZZY
-#if 0
-/* actual location mgt_param_tbl.c */
-PARAM(
- /* name */ shm_reclen,
- /* typ */ vsl_reclen,
- /* min */ "16b",
- /* max */ NULL,
- /* default */ "255b",
- /* units */ "bytes",
- /* flags */ 0,
- /* s-text */
- "Old name for vsl_reclen, use that instead.",
- /* l-text */ "",
- /* func */ NULL
-)
-#endif
-
PARAM(
/* name */ shortlived,
/* typ */ timeout,
@@ -1585,39 +1568,6 @@ PARAM(
/* func */ NULL
)
-#if 0
-/* actual location mgt_param_tbl.c */
-PARAM(
- /* name */ vcl_dir,
- /* typ */ string,
- /* min */ NULL,
- /* max */ NULL,
- /* default */ "/opt/varnish/etc/varnish",
- /* units */ NULL,
- /* flags */ 0,
- /* s-text */
- "Directory from which relative VCL filenames (vcl.load and "
- "include) are opened.",
- /* l-text */ "",
- /* func */ NULL
-)
-
-/* actual location mgt_param_tbl.c */
-PARAM(
- /* name */ vmod_dir,
- /* typ */ string,
- /* min */ NULL,
- /* max */ NULL,
- /* default */ "/opt/varnish/lib/varnish/vmods",
- /* units */ NULL,
- /* flags */ 0,
- /* s-text */
- "Directory where Varnish modules are to be found.",
- /* l-text */ "",
- /* func */ NULL
-)
-#endif
-
PARAM(
/* name */ vsl_buffer,
/* typ */ vsl_buffer,
More information about the varnish-commit
mailing list