From c625e53222d655c3b583f198f687d5dd2307b68d Mon Sep 17 00:00:00 2001 From: Laurent Demailly Date: Fri, 10 Oct 2025 20:18:19 -0700 Subject: [PATCH 1/2] Handle -quiet before setting the cli default --- cli.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cli.go b/cli.go index 3a28d63..e109f5f 100644 --- a/cli.go +++ b/cli.go @@ -160,7 +160,6 @@ func Main() { ArgsHelp = " " + ArgsHelp } if !ServerMode { - log.SetDefaultsForClientTools() log.LoggerStaticFlagSetup("loglevel") } flag.CommandLine.Usage = func() { usage(os.Stderr, "") } // flag handling will exit 1 after calling usage, except for -h/-help @@ -197,6 +196,12 @@ func Main() { os.Stderr.WriteString(log.Colors.BrightRed) flag.Parse() os.Stderr.WriteString(log.Colors.Reset) + if *quietFlag { + log.SetLogLevelQuiet(log.Error) + } + if !ServerMode { + log.SetDefaultsForClientTools() + } if *nocolor { // Don't override the env if the flag isn't set // (downside is if LOGGER_CONSOLE_COLOR is set to false, this -logger-no-color=false can't override it) @@ -224,9 +229,6 @@ func Main() { errArgCount(exactly, MaxArgs, nArgs) return // not typically reached, unless ExitFunction doesn't exit } - if *quietFlag { - log.SetLogLevelQuiet(log.Error) - } } func errArgCount(prefix string, expected, actual int) { From 5e449800fc11aff3e148cbc3fec0acf5730d0965 Mon Sep 17 00:00:00 2001 From: Laurent Demailly Date: Fri, 10 Oct 2025 20:23:02 -0700 Subject: [PATCH 2/2] Linter --- cli.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli.go b/cli.go index e109f5f..fbd9377 100644 --- a/cli.go +++ b/cli.go @@ -129,7 +129,7 @@ func EnvHelp(w io.Writer) { // For a server with dynamic flags, call ServerMain instead. // Will either have called [ExitFunction] (defaults to [os.Exit]) // or returned if all validations passed. -func Main() { +func Main() { //nolint: funlen // just over 70 lines quietFlag := flag.Bool("quiet", false, "Quiet mode, sets loglevel to Error (quietly) to reduces the output") flag.BoolVar(&log.Config.ForceColor, "logger-force-color", false,