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: diag: run the final diags before quitting when using -c

Browse Source 
Final diags were added in 2.4 by commit 5a6926dcf ("MINOR: diag: create
cfgdiag module"), but it's called too late in the startup process,
because when "-c" is passed, the call is not made, while it's its primary
use case. Let's just move the call earlier.

Note that currently the check in this function is limited to verifying
unicity of server cookies in a backend, so it can be backported as far
as 2.4, but there is little value in insisting if it doesn't backport
easily.
This commit is contained in:
Willy Tarreau 2024-02-03 12:05:08 +01:00
parent ced4148401
commit 75d64c0d4c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/haproxy.c
View File

@ -2380,6 +2380,10 @@ static void init(int argc, char **argv)
if (global.mode & MODE_DUMP_KWD)
dump_registered_keywords();
if (global.mode & MODE_DIAG) {
cfg_run_diagnostics();
}
if (global.mode & MODE_CHECK) {
struct peers *pr;
struct proxy *px;
@ -2415,10 +2419,6 @@ static void init(int argc, char **argv)
if (global.mode & MODE_DUMP_CFG)
deinit_and_exit(0);
if (global.mode & MODE_DIAG) {
cfg_run_diagnostics();
}
#ifdef USE_OPENSSL
/* Initialize SSL random generator. Must be called before chroot for