Skip to content

Commit d3eb00e

Browse files
committed
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.
1 parent bbe7828 commit d3eb00e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/haproxy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2786,7 +2786,7 @@ static void step_init_2(int argc, char** argv)
27862786

27872787
/* Note: we could disable any poller by name here */
27882788

2789-
if (global.mode & (MODE_VERBOSE|MODE_DEBUG)) {
2789+
if ((global.mode & (MODE_VERBOSE|MODE_DEBUG)) && !master) {
27902790
list_pollers(stderr);
27912791
fprintf(stderr, "\n");
27922792
list_filters(stderr);

0 commit comments

Comments
 (0)