From d3eb00e61d434ac6d4c7a4b1294d5d7c7fcea7a7 Mon Sep 17 00:00:00 2001 From: Valentine Krasnobaeva Date: Wed, 30 Oct 2024 10:49:26 +0100 Subject: [PATCH] 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. --- src/haproxy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/haproxy.c b/src/haproxy.c index ffee48779..80bb090b3 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); -- 2.47.3