projects
/
haproxy-2.1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7d360ab
)
DOC: cache: Use '<name>' instead of '<id>' in error message
author
Tim Duesterhus
<tim@bastelstu.be>
Tue, 18 Aug 2020 20:06:51 +0000
(22:06 +0200)
committer
Christopher Faulet
<cfaulet@haproxy.com>
Tue, 1 Sep 2020 12:42:01 +0000
(14:42 +0200)
When the cache name is left out in 'filter cache' the error message refers
to a missing '<id>'. The name of the cache is called 'name' within the docs.
Adjust the error message for consistency.
The error message was introduced in
99a17a2d91f9044ea20bba6617048488aed80555
.
This commit first appeared in 1.9, thus the patch must be backported to 1.9+.
(cherry picked from commit
ea969f6f26adfa081df0d439723813cfcd4862c4
)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit
a2acefe080df9b2430d823129173591df2c9f4a3
)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
src/cache.c
patch
|
blob
|
history
diff --git
a/src/cache.c
b/src/cache.c
index
56aad8f
..
ddfd1b0
100644
(file)
--- a/
src/cache.c
+++ b/
src/cache.c
@@
-1424,7
+1424,7
@@
parse_cache_flt(char **args, int *cur_arg, struct proxy *px,
/* Get the cache filter name. <pos> point on "cache" keyword */
if (!*args[pos + 1]) {
- memprintf(err, "%s : expects an <id> argument", args[pos]);
+ memprintf(err, "%s : expects a <name> argument", args[pos]);
goto error;
}
name = strdup(args[pos + 1]);