From: Valentine Krasnobaeva <vkrasnobaeva@haproxy.com>
Date: Tue, 29 Oct 2024 18:25:07 +0000 (+0100)
Subject: BUG/MINOR: startup: dump keywords only in worker if started with -W -dKAll
X-Git-Tag: v3.1-dev11~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbe7828d497553701f6e32a2d55a9c820a49d293;p=thirdparty%2Fhaproxy.git

BUG/MINOR: startup: dump keywords only in worker if started with -W -dKAll

If haproxy was started with -W -dK*, after master-worker refactoring, we dump
registered keywords to stdout twice in master and in worker processes. This
information is redundant and output has no longer the right format. So, as the
keyword registration happens very early before the fork, let's dump keywords
only in the worker context, if haproxy was launched with -W.

This does not need to be backported, as related to the latest master-worker
refactoring.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index f0d8b78338..ffee48779f 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -2464,7 +2464,7 @@ static void step_init_2(int argc, char** argv)
 	}
 #endif
 
-	if (global.mode & MODE_DUMP_KWD)
+	if (global.mode & MODE_DUMP_KWD && !master)
 		dump_registered_keywords();
 
 	if (global.mode & MODE_DIAG) {