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 f0d8b783384f1fa5cfb233bae8b2a4a39db8362c..ffee48779f1bf16690d325ae2c9d13b2b6a816cc 100644 (file)
--- 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) {