From 65dcc5876f58b6962eaba91175fa04fe4ac925b8 Mon Sep 17 00:00:00 2001 From: Victor Edvardsson Date: Mon, 15 Apr 2024 15:59:36 +0200 Subject: [PATCH] Fix order of arguments passed --- pkg/apiserver/apiserver_test.go | 2 +- pkg/types/utils.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/apiserver/apiserver_test.go b/pkg/apiserver/apiserver_test.go index f04b301be..c04671d64 100644 --- a/pkg/apiserver/apiserver_test.go +++ b/pkg/apiserver/apiserver_test.go @@ -344,7 +344,7 @@ func TestLoggingDebugToFileConfig(t *testing.T) { cfg.LogLevel = ptr.Of(log.DebugLevel) // Configure logging - err := types.SetDefaultLoggerConfig(cfg.LogMedia, cfg.LogDir, *cfg.LogLevel, cfg.LogMaxSize, cfg.LogMaxFiles, cfg.LogMaxAge, cfg.CompressLogs, cfg.LogFormat, false) + err := types.SetDefaultLoggerConfig(cfg.LogMedia, cfg.LogDir, *cfg.LogLevel, cfg.LogMaxSize, cfg.LogMaxFiles, cfg.LogMaxAge, cfg.LogFormat, cfg.CompressLogs, false) require.NoError(t, err) api, err := NewServer(&cfg) diff --git a/pkg/types/utils.go b/pkg/types/utils.go index 22d315502..88d8f51d7 100644 --- a/pkg/types/utils.go +++ b/pkg/types/utils.go @@ -14,7 +14,7 @@ var logFormatter log.Formatter var LogOutput *lumberjack.Logger //io.Writer var logLevel log.Level -func SetDefaultLoggerConfig(cfgMode string, cfgFolder string, cfgLevel log.Level, maxSize int, maxFiles int, maxAge int, compress *bool, LogFormat string, forceColors bool) error { +func SetDefaultLoggerConfig(cfgMode string, cfgFolder string, cfgLevel log.Level, maxSize int, maxFiles int, maxAge int, LogFormat string, compress *bool, forceColors bool) error { // Set text as default formatter if log_format: text is configured or log_format: "" logFormatter = &log.TextFormatter{TimestampFormat: time.RFC3339, FullTimestamp: true, ForceColors: forceColors}