]> git.kaiwu.me - haproxy.git/commitdiff
CLEANUP: haproxy: remove -dt parsing and help when !USE_TRACE
authorWilly Tarreau <w@1wt.eu>
Wed, 1 Jul 2026 09:09:18 +0000 (11:09 +0200)
committerWilly Tarreau <w@1wt.eu>
Fri, 3 Jul 2026 14:32:28 +0000 (16:32 +0200)
Better not show -dt in the help message and stop parsing it when
USE_TRACE is disabled since traces won't work anyway.

src/haproxy.c

index 19469b210abe41196907117e63dbe8d14de17618..405386cb192b896d41d428b3e82059a63c7ee95b 100644 (file)
@@ -747,7 +747,9 @@ static void usage(char *name)
                "        -vq/-vqs/-vqb only displays version, short version, branch.\n"
                "        -d enters debug mode ; -db only disables background mode.\n"
                "        -dM[<byte>,help,...] debug memory (default: poison with <byte>/0x50)\n"
+#if defined(USE_TRACE)
                "        -dt activate traces on stderr; see '-dt help'\n"
+#endif
                "        -V enters verbose mode (disables quiet mode)\n"
                "        -D goes daemon ; -C changes to <dir> before loading files.\n"
                "        -W master-worker mode.\n"
@@ -1647,6 +1649,7 @@ void haproxy_init_args(int argc, char **argv)
                                arg_mode |= MODE_DUMP_KWD;
                                kwd_dump = flag + 2;
                        }
+#if defined(USE_TRACE)
                        else if (*flag == 'd' && flag[1] == 't') {
                                char *arg = flag + 2;
                                int ret;
@@ -1663,6 +1666,7 @@ void haproxy_init_args(int argc, char **argv)
                                        exit(EXIT_FAILURE);
                                }
                        }
+#endif
 #ifdef HA_USE_KTLS
                        else if (*flag == 'd' && flag[1] == 'T') {
                                global.tune.options |= GTUNE_NO_KTLS;
@@ -3635,7 +3639,9 @@ int main(int argc, char **argv)
                list_for_each_entry_safe(cfg, cfg_tmp, &cfg_cfgfiles, list)
                        ha_free(&cfg->content);
 
+#if defined(USE_TRACE)
                trace_parse_cmds();
+#endif
                usermsgs_clr(NULL);
        }