mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 20:46:11 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: log: missing some ARGC_* entries in fmt_directives()

Browse Source 
ARGC_CAP was not added to fmt_directives() which is used to format
error messages when failing to parse log format expressions. The
whole switch/case has been reorganized to match the declaration
order making it easier to spot missing values. The default is not
the "log" directive anymore but "undefined" asking to report the
bug.

Backport to 1.5 is not strictly needed but is desirable at least
for code sanity.
This commit is contained in:
Willy Tarreau 2015-07-09 11:20:00 +02:00
parent 5fc7d7e8ce
commit 53e1a6d317
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/log.c
View File

@ -174,22 +174,26 @@ struct logformat_var_args var_args_list[] = {
static inline const char *fmt_directive(const struct proxy *curproxy)
{
switch (curproxy->conf.args.ctx) {
case ARGC_UIF:
return "unique-id-format";
case ARGC_ACL:
return "acl";
case ARGC_STK:
return "stick";
case ARGC_TRK:
return "track-sc";
case ARGC_LOG:
return "log-format";
case ARGC_HRQ:
return "http-request";
case ARGC_HRS:
return "http-response";
case ARGC_STK:
return "stick";
case ARGC_TRK:
return "track-sc"; break;
case ARGC_UIF:
return "unique-id-format";
case ARGC_RDR:
return "redirect"; break;
case ARGC_ACL:
return "acl"; break;
return "redirect";
case ARGC_CAP:
return "capture";
default:
return "log-format";
return "undefined(please report this bug)"; /* must never happen */
}
}