RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-12 14:35:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

[BUG] config: report the correct proxy type in tcp-request errors

Browse Source 
A copy-paste typo caused a wrong proxy's type to be reported in case of
parsing errors.
This commit is contained in:
Willy Tarreau 2010-06-14 18:40:26 +02:00
parent 6a984fa7c1
commit f535683123
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/proto_tcp.c
View File

@ -766,7 +766,7 @@ static int tcp_parse_tcp_req(char **args, int section_type, struct proxy *curpx,
if (!*args[1]) {
snprintf(err, errlen, "missing argument for '%s' in %s '%s'",
args[0], proxy_type_str(proxy), curpx->id);
args[0], proxy_type_str(curpx), curpx->id);
return -1;
}
@ -779,7 +779,7 @@ static int tcp_parse_tcp_req(char **args, int section_type, struct proxy *curpx,
if (!(curpx->cap & PR_CAP_FE)) {
snprintf(err, errlen, "%s %s will be ignored because %s '%s' has no %s capability",
args[0], args[1], proxy_type_str(proxy), curpx->id,
args[0], args[1], proxy_type_str(curpx), curpx->id,
"frontend");
return 1;
}
@ -787,7 +787,7 @@ static int tcp_parse_tcp_req(char **args, int section_type, struct proxy *curpx,
if (!*args[2] || (ptr = parse_time_err(args[2], &val, TIME_UNIT_MS))) {
retlen = snprintf(err, errlen,
"'%s %s' expects a positive delay in milliseconds, in %s '%s'",
args[0], args[1], proxy_type_str(proxy), curpx->id);
args[0], args[1], proxy_type_str(curpx), curpx->id);
if (ptr && retlen < errlen)
retlen += snprintf(err+retlen, errlen - retlen,
" (unexpected character '%c')", *ptr);
@ -796,7 +796,7 @@ static int tcp_parse_tcp_req(char **args, int section_type, struct proxy *curpx,
if (curpx->tcp_req.inspect_delay) {
snprintf(err, errlen, "ignoring %s %s (was already defined) in %s '%s'",
args[0], args[1], proxy_type_str(proxy), curpx->id);
args[0], args[1], proxy_type_str(curpx), curpx->id);
return 1;
}
curpx->tcp_req.inspect_delay = val;