Commit bcd19fd5 authored by Geoff Simmons's avatar Geoff Simmons

Fix error messages from pool().

parent a930f6d4
......@@ -137,7 +137,7 @@ varnish v1 -expect MEMPOOL.pesi.pool <= 20
## Errors
varnish v1 -errvcl "vdp pesi failure: min (0) must be > 0 in pool_pesi()" {
varnish v1 -errvcl "vdp pesi failure: min (0) must be > 0 in pool()" {
import ${vmod_pesi};
backend b { .host = "${bad_ip}"; }
......@@ -146,7 +146,7 @@ varnish v1 -errvcl "vdp pesi failure: min (0) must be > 0 in pool_pesi()" {
}
}
varnish v1 -errvcl "vdp pesi failure: max (-1) must be > 0 in pool_pesi()" {
varnish v1 -errvcl "vdp pesi failure: max (-1) must be > 0 in pool()" {
import ${vmod_pesi};
backend b { .host = "${bad_ip}"; }
......@@ -155,7 +155,7 @@ varnish v1 -errvcl "vdp pesi failure: max (-1) must be > 0 in pool_pesi()" {
}
}
varnish v1 -errvcl "vdp pesi failure: max (1) < min (2) in pool_pesi()" {
varnish v1 -errvcl "vdp pesi failure: max (1) < min (2) in pool()" {
import ${vmod_pesi};
backend b { .host = "${bad_ip}"; }
......@@ -164,7 +164,7 @@ varnish v1 -errvcl "vdp pesi failure: max (1) < min (2) in pool_pesi()" {
}
}
varnish v1 -errvcl "vdp pesi failure: max_age (-1s) < 0s in pool_pesi()" {
varnish v1 -errvcl "vdp pesi failure: max_age (-1s) < 0s in pool()" {
import ${vmod_pesi};
backend b { .host = "${bad_ip}"; }
......@@ -173,7 +173,7 @@ varnish v1 -errvcl "vdp pesi failure: max_age (-1s) < 0s in pool_pesi()" {
}
}
varnish v1 -errvcl "vdp pesi failure: max_age (1000001s) out of range in pool_pesi() (max 10^6s)" {
varnish v1 -errvcl "vdp pesi failure: max_age (1000001s) out of range in pool() (max 10^6s)" {
import ${vmod_pesi};
backend b { .host = "${bad_ip}"; }
......
......@@ -2649,24 +2649,24 @@ vmod_pool(VRT_CTX, VCL_INT min, VCL_INT max, VCL_DURATION max_age)
/* cf. tweak_poolparam() in mgt_param_tweak.c */
if (min <= 0) {
VFAIL(ctx, "min (%jd) must be > 0 in pool_pesi()", min);
VFAIL(ctx, "min (%jd) must be > 0 in pool()", min);
return;
}
if (max <= 0) {
VFAIL(ctx, "max (%jd) must be > 0 in pool_pesi()", max);
VFAIL(ctx, "max (%jd) must be > 0 in pool()", max);
return;
}
if (max < min) {
VFAIL(ctx, "max (%jd) < min (%jd) in pool_pesi()", max, min);
VFAIL(ctx, "max (%jd) < min (%jd) in pool()", max, min);
return;
}
if (max_age < 0.) {
VFAIL(ctx, "max_age (%.0fs) < 0s in pool_pesi()", max_age);
VFAIL(ctx, "max_age (%.0fs) < 0s in pool()", max_age);
return;
}
if (max_age > 1e6) {
VFAIL(ctx, "max_age (%.0fs) out of range in pool_pesi() "
"(max 10^6s)", max_age);
VFAIL(ctx, "max_age (%.0fs) out of range in pool() (max 10^6s)",
max_age);
return;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment