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

CLEANUP: log: Stop touching struct stream internals for %ID

Browse Source 
Use the return value of `stream_generate_unique_id()` instead of relying on the
`unique_id` field of `struct stream` when handling the `%ID` log placeholder.
This also allowed to unify the "stream available" and "stream not available"
paths.

Reviewed-by: Volker Dusch <github@wallbash.com>
This commit is contained in:
Tim Duesterhus 2026-04-13 19:37:29 +02:00 committed by Willy Tarreau
parent 38796d4c06
commit 7ff2627112
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/log.c
View File

@ -5171,20 +5171,18 @@ size_t sess_build_logline_orig(struct session *sess, struct stream *s,
break;
case LOG_FMT_UNIQUEID: // %ID
ret = NULL;
if (s) {
/* if unique-id was not generated */
if (!isttest(s->unique_id) && !lf_expr_isempty(&sess->fe->format_unique_id)) {
stream_generate_unique_id(s, &sess->fe->format_unique_id);
}
ret = lf_text_len(tmplog, s->unique_id.ptr, s->unique_id.len, maxsize - (tmplog - dst), ctx);
}
else
ret = lf_text_len(tmplog, NULL, 0, maxsize - (tmplog - dst), ctx);
{
struct ist unique_id = IST_NULL;
if (s && !lf_expr_isempty(&sess->fe->format_unique_id))
unique_id = stream_generate_unique_id(s, &sess->fe->format_unique_id);
ret = lf_text_len(tmplog, istptr(unique_id), istlen(unique_id), maxsize - (tmplog - dst), ctx);
if (ret == NULL)
goto out;
tmplog = ret;
break;
}
case LOG_FMT_ORIGIN: // %OG
ret = lf_text(tmplog, log_orig_to_str(log_orig.id),