From bfa55f8c67c1f989adeeb5c8aeb9cfb17bae6392 Mon Sep 17 00:00:00 2001
From: andres-portainer <91705312+andres-portainer@users.noreply.github.com>
Date: Tue, 15 Apr 2025 17:16:04 -0300
Subject: [PATCH] fix(logs): remove duplicated code BE-11821 (#653)

---
 api/cmd/portainer/main.go          | 9 +++++----
 api/{cmd/portainer => logs}/log.go | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)
 rename api/{cmd/portainer => logs}/log.go (91%)

diff --git a/api/cmd/portainer/main.go b/api/cmd/portainer/main.go
index f16b3db0f..99f809c7c 100644
--- a/api/cmd/portainer/main.go
+++ b/api/cmd/portainer/main.go
@@ -39,6 +39,7 @@ import (
 	"github.com/portainer/portainer/api/kubernetes"
 	kubecli "github.com/portainer/portainer/api/kubernetes/cli"
 	"github.com/portainer/portainer/api/ldap"
+	"github.com/portainer/portainer/api/logs"
 	"github.com/portainer/portainer/api/oauth"
 	"github.com/portainer/portainer/api/pendingactions"
 	"github.com/portainer/portainer/api/pendingactions/actions"
@@ -581,13 +582,13 @@ func buildServer(flags *portainer.CLIFlags) portainer.Server {
 }
 
 func main() {
-	configureLogger()
-	setLoggingMode("PRETTY")
+	logs.ConfigureLogger()
+	logs.SetLoggingMode("PRETTY")
 
 	flags := initCLI()
 
-	setLoggingLevel(*flags.LogLevel)
-	setLoggingMode(*flags.LogMode)
+	logs.SetLoggingLevel(*flags.LogLevel)
+	logs.SetLoggingMode(*flags.LogMode)
 
 	for {
 		server := buildServer(flags)
diff --git a/api/cmd/portainer/log.go b/api/logs/log.go
similarity index 91%
rename from api/cmd/portainer/log.go
rename to api/logs/log.go
index b5b4121ea..b44e6dc8c 100644
--- a/api/cmd/portainer/log.go
+++ b/api/logs/log.go
@@ -1,4 +1,4 @@
-package main
+package logs
 
 import (
 	"fmt"
@@ -10,7 +10,7 @@ import (
 	"github.com/rs/zerolog/pkgerrors"
 )
 
-func configureLogger() {
+func ConfigureLogger() {
 	zerolog.ErrorStackFieldName = "stack_trace"
 	zerolog.ErrorStackMarshaler = pkgerrors.MarshalStack
 	zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
@@ -21,7 +21,7 @@ func configureLogger() {
 	log.Logger = log.Logger.With().Caller().Stack().Logger()
 }
 
-func setLoggingLevel(level string) {
+func SetLoggingLevel(level string) {
 	switch level {
 	case "ERROR":
 		zerolog.SetGlobalLevel(zerolog.ErrorLevel)
@@ -34,7 +34,7 @@ func setLoggingLevel(level string) {
 	}
 }
 
-func setLoggingMode(mode string) {
+func SetLoggingMode(mode string) {
 	switch mode {
 	case "PRETTY":
 		log.Logger = log.Output(zerolog.ConsoleWriter{