Skip to content

Commit bbe7828

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

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
@@ -2464,7 +2464,7 @@ static void step_init_2(int argc, char** argv)
24642464
}
24652465
#endif
24662466

2467-
if (global.mode & MODE_DUMP_KWD)
2467+
if (global.mode & MODE_DUMP_KWD && !master)
24682468
dump_registered_keywords();
24692469

24702470
if (global.mode & MODE_DIAG) {

0 commit comments

Comments
 (0)