From c2a6220fdeb2fe46a4e70d04bb6e39f9555627b5 Mon Sep 17 00:00:00 2001 From: Antoine Aflalo <197810+Belphemur@users.noreply.github.com> Date: Tue, 26 Aug 2025 22:36:00 -0400 Subject: [PATCH] fix(logging): fix logging parameter not taken into account --- .gitignore | 3 ++- .vscode/launch.json | 31 ++++++++++++++-------------- cmd/cbzoptimizer/commands/rootcmd.go | 12 ++++++++--- cmd/cbzoptimizer/main.go | 3 --- go.mod | 2 -- 5 files changed, 27 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index d790c5c..5383c95 100644 --- a/.gitignore +++ b/.gitignore @@ -102,4 +102,5 @@ fabric.properties .idea/httpRequests # Android studio 3.1+ serialized cache file -.idea/caches/build_file_checksums.ser \ No newline at end of file +.idea/caches/build_file_checksums.ser +*__debug_bin* diff --git a/.vscode/launch.json b/.vscode/launch.json index 81d924e..0d285e8 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,16 +1,17 @@ { - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - - { - "name": "Launch Package", - "type": "go", - "request": "launch", - "mode": "auto", - "program": "${fileDirname}" - } - ] -} \ No newline at end of file + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "Optimize Testdata", + "type": "go", + "request": "launch", + "mode": "auto", + "program": "${workspaceFolder}/cmd/cbzoptimizer", + "args": ["optimize", "${workspaceFolder}/testdata", "-l", "debug"], + "cwd": "${workspaceFolder}" + } + ] +} diff --git a/cmd/cbzoptimizer/commands/rootcmd.go b/cmd/cbzoptimizer/commands/rootcmd.go index b38121c..661fe7b 100644 --- a/cmd/cbzoptimizer/commands/rootcmd.go +++ b/cmd/cbzoptimizer/commands/rootcmd.go @@ -60,8 +60,14 @@ func init() { "Set log level; can be 'panic', 'fatal', 'error', 'warn', 'info', 'debug', or 'trace'") // Add log level environment variable support - viper.SetEnvPrefix("") - viper.BindEnv("LOG_LEVEL") + viper.BindEnv("log", "LOG_LEVEL") + viper.BindPFlag("log", rootCmd.PersistentFlags().Lookup("log")) + + rootCmd.PersistentPreRun = func(cmd *cobra.Command, args []string) { + ConfigureLogging() + } + + // Ensure the configuration directory exists err := os.MkdirAll(configFolder, os.ModePerm) if err != nil { @@ -95,7 +101,7 @@ func ConfigureLogging() { level := zerolog.InfoLevel // Check LOG_LEVEL environment variable first - envLogLevel := viper.GetString("LOG_LEVEL") + envLogLevel := viper.GetString("log") if envLogLevel != "" { if parsedLevel, err := zerolog.ParseLevel(envLogLevel); err == nil { level = parsedLevel diff --git a/cmd/cbzoptimizer/main.go b/cmd/cbzoptimizer/main.go index ddade84..ffcb203 100644 --- a/cmd/cbzoptimizer/main.go +++ b/cmd/cbzoptimizer/main.go @@ -13,8 +13,5 @@ var ( func main() { commands.SetVersionInfo(version, commit, date) - // Configure logging before executing commands - commands.ConfigureLogging() - commands.Execute() } diff --git a/go.mod b/go.mod index 0557016..cbb7d02 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module github.com/belphemur/CBZOptimizer/v2 go 1.25 -toolchain go1.25.0 - require ( github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de github.com/belphemur/go-webpbin/v2 v2.0.0