mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 07:07:04 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: logs: fix log-steps extra log origins selection

Browse Source 
Willy noticed that it was not possible to select extra log origins using
log-steps directive. Extra origins are the one registered using
log_orig_register() such as http-req.

Reason was the error path was always executed during extra log origin
matching for log-steps parser, while it should only be executed if no
match was found.

It should be backported to 3.1.
This commit is contained in:
Aurelien DARRAGON 2025-07-21 15:18:37 +02:00
parent f8e9545f70
commit 563b4fafc2
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/log.c
View File

@ -6837,7 +6837,7 @@ static int px_parse_log_steps(char **args, int section_type, struct proxy *curpx
while (str[0]) {
struct eb32_node *cur_step;
enum log_orig_id cur_id;
enum log_orig_id cur_id = LOG_ORIG_UNSPEC;
cur_sep = strcspn(str, ",");
@ -6862,14 +6862,16 @@ static int px_parse_log_steps(char **args, int section_type, struct proxy *curpx
}
}
memprintf(err,
"invalid log step name (%.*s). Expected values are: "
"accept, request, connect, response, close",
(int)cur_sep, str);
list_for_each_entry(cur, &log_origins, list)
memprintf(err, "%s, %s", *err, cur->name);
if (cur_id == LOG_ORIG_UNSPEC) {
memprintf(err,
"invalid log step name (%.*s). Expected values are: "
"accept, request, connect, response, close",
(int)cur_sep, str);
list_for_each_entry(cur, &log_origins, list)
memprintf(err, "%s, %s", *err, cur->name);
goto end;
goto end;
}
}
cur_step = malloc(sizeof(*cur_step));