Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
libvdp-pesi
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Jobs
Commits
Open sidebar
uplex-varnish
libvdp-pesi
Commits
bcd19fd5
Commit
bcd19fd5
authored
Jul 29, 2019
by
Geoff Simmons
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix error messages from pool().
parent
a930f6d4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
poolparam.vtc
src/tests/poolparam.vtc
+5
-5
vdp_pesi.c
src/vdp_pesi.c
+6
-6
No files found.
src/tests/poolparam.vtc
View file @
bcd19fd5
...
...
@@ -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}"; }
...
...
src/vdp_pesi.c
View file @
bcd19fd5
...
...
@@ -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
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment