From 3a5b28e00cb38aa1352a9db7b9eb19b4e54aa6ed Mon Sep 17 00:00:00 2001 From: Valentine Krasnobaeva Date: Fri, 18 Oct 2024 20:25:34 +0200 Subject: [PATCH] BUG/MINOR: mworker/cli: show master startup logs in recovery mode When master enters in recovery mode after unsuccessfull reload HAPROXY_LOAD_SUCCESS should be set as 0. Like this cli_io_handler_show_cli_sock() could dump in master CLI its warnings and alerts, saved in startup logs ring. No need to backport this fix, as this is related to the previous patches in this version to refactor master-worker architecture. --- src/haproxy.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/haproxy.c b/src/haproxy.c index 9107a14de2..e8b688f1ee 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -3030,6 +3030,11 @@ static void run_master_in_recovery_mode(int argc, char **argv) { struct mworker_proc *proc; + /* HAPROXY_LOAD_SUCCESS is checked in cli_io_handler_show_cli_sock() to + * dump master startup logs with its alerts/warnings via master CLI sock. + */ + setenv("HAPROXY_LOAD_SUCCESS", "0", 1); + /* increment the number failed reloads */ list_for_each_entry(proc, &proc_list, list) { proc->failedreloads++;