Merge branch '502-restore-log-level-config' into 'main'

Respect log-level configuration again

Closes #502

See merge request gitlab-org/gitlab-shell!530

1 files changed, 26 insertions, 2 deletions

diff --git a/internal/logger/logger_test.go b/internal/logger/logger_test.go
index bda36d9..4ea8c1f 100644
--- a/internal/logger/logger_test.go
+++ b/internal/logger/logger_test.go
@@ -3,7 +3,6 @@ package logger
 import (
 	"os"
 	"regexp"
-	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -26,12 +25,37 @@ func TestConfigure(t *testing.T) {
 	defer closer.Close()
 
 	log.Info("this is a test")
+	log.WithFields(log.Fields{}).Debug("debug log message")
 
 	tmpFile.Close()
 
 	data, err := os.ReadFile(tmpFile.Name())
 	require.NoError(t, err)
-	require.True(t, strings.Contains(string(data), `msg":"this is a test"`))
+	require.Contains(t, string(data), `msg":"this is a test"`)
+	require.NotContains(t, string(data), `msg:":"debug log message"`)
+}
+
+func TestConfigureWithDebugLogLevel(t *testing.T) {
+	tmpFile, err := os.CreateTemp(os.TempDir(), "logtest-")
+	require.NoError(t, err)
+	defer tmpFile.Close()
+
+	config := config.Config{
+		LogFile:   tmpFile.Name(),
+		LogFormat: "json",
+		LogLevel:  "debug",
+	}
+
+	closer := Configure(&config)
+	defer closer.Close()
+
+	log.WithFields(log.Fields{}).Debug("debug log message")
+
+	tmpFile.Close()
+
+	data, err := os.ReadFile(tmpFile.Name())
+	require.NoError(t, err)
+	require.Contains(t, string(data), `msg":"debug log message"`)
 }
 
 func TestConfigureWithPermissionError(t *testing.T) {