From: Valentine Krasnobaeva <vkrasnobaeva@haproxy.com>
Date: Wed, 30 Oct 2024 09:49:26 +0000 (+0100)
Subject: BUG/MINOR: startup: don't dump polling info for master in verbose mode
X-Git-Tag: v3.1-dev11~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3eb00e61d434ac6d4c7a4b1294d5d7c7fcea7a7;p=thirdparty%2Fhaproxy.git

BUG/MINOR: startup: don't dump polling info for master in verbose mode

As master-worker fork happens now before step_init_2(), when pollers are
initialized and polling settings and dumped then in verbose and in debug modes
to stdout, it turns out that master and worker dump its same polling
settings separately. This creates long and messy output in these modes.

Polling settings are the same for master and for worker process for the moment.
Even if they would diverge in future we are interested here in worker's
settings. So, when started in the master-worker mode let's dump it only in the
worker context.

This doesn't need to be backported as related to the latest master-worker
refactoring.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index ffee48779f..80bb090b36 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -2786,7 +2786,7 @@ static void step_init_2(int argc, char** argv)
 
 	/* Note: we could disable any poller by name here */
 
-	if (global.mode & (MODE_VERBOSE|MODE_DEBUG)) {
+	if ((global.mode & (MODE_VERBOSE|MODE_DEBUG)) && !master) {
 		list_pollers(stderr);
 		fprintf(stderr, "\n");
 		list_filters(stderr);