Willy,

I retract patch 3, this would cause a regression of the change in commit
fb7b5c8a53cb4f19a223abd20660d47162aa8708.

I've updated patch 3 to add a comment instead, fixed the conflict in patch 4
and fixed the same bug in patch 8.

Best regards

Tim Duesterhus (9):
  BUG/MINOR: log: Fix error message when using unavailable fetch in
    logfmt
  CLEANUP: log: Return `size_t` from `sess_build_logline_orig()`
  CLEANUP: stream: Explain the two-step initialization in
    `stream_generate_unique_id()`
  CLEANUP: stream: Reduce duplication in `stream_generate_unique_id()`
  CLEANUP: log: Stop touching `struct stream` internals for `%ID`
  CLEANUP: http_fetch: Use local `unique_id` variable in
    `smp_fetch_uniqueid()`
  MINOR: check: Add `unique_id` field to `struct check`
  MINOR: check: Add `check_generate_unique_id()`
  MINOR: http_fetch: Add support for checks to `unique-id` fetch

 doc/configuration.txt          |  9 +++++--
 include/haproxy/check-t.h      |  1 +
 include/haproxy/check.h        |  1 +
 include/haproxy/log.h          |  8 +++---
 reg-tests/checks/unique_id.vtc | 49 ++++++++++++++++++++++++++++++++++
 src/check.c                    | 26 ++++++++++++++++++
 src/http_ana.c                 |  6 ++---
 src/http_fetch.c               | 21 ++++++++++-----
 src/log.c                      | 35 ++++++++++++------------
 src/stream.c                   | 12 ++++-----
 10 files changed, 130 insertions(+), 38 deletions(-)
 create mode 100644 reg-tests/checks/unique_id.vtc

-- 
2.53.0



Reply via email to