Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-19 05:19:39 +02:00
Code Issues Releases Activity

fix(logs): remove duplicated code BE-11821 (#653)

Browse source
This commit is contained in:
andres-portainer 2025-04-15 17:16:04 -03:00 • committed by GitHub
parent 5a2318d01f
commit bfa55f8c67
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
api/cmd/portainer/main.go
View file

@ -39,6 +39,7 @@ import (
"github.com/portainer/portainer/api/kubernetes" "github.com/portainer/portainer/api/kubernetes"
kubecli "github.com/portainer/portainer/api/kubernetes/cli" kubecli "github.com/portainer/portainer/api/kubernetes/cli"
"github.com/portainer/portainer/api/ldap" "github.com/portainer/portainer/api/ldap"
"github.com/portainer/portainer/api/logs"
"github.com/portainer/portainer/api/oauth" "github.com/portainer/portainer/api/oauth"
"github.com/portainer/portainer/api/pendingactions" "github.com/portainer/portainer/api/pendingactions"
"github.com/portainer/portainer/api/pendingactions/actions" "github.com/portainer/portainer/api/pendingactions/actions"
@ -581,13 +582,13 @@ func buildServer(flags *portainer.CLIFlags) portainer.Server {
} }
func main() { func main() {
configureLogger() logs.ConfigureLogger()
setLoggingMode("PRETTY") logs.SetLoggingMode("PRETTY")
flags := initCLI() flags := initCLI()
setLoggingLevel(*flags.LogLevel) logs.SetLoggingLevel(*flags.LogLevel)
setLoggingMode(*flags.LogMode) logs.SetLoggingMode(*flags.LogMode)
for { for {
server := buildServer(flags) server := buildServer(flags)

8
api/cmd/portainer/log.go → api/logs/log.go
View file

@ -1,4 +1,4 @@
package main package logs
import ( import (
"fmt" "fmt"
@ -10,7 +10,7 @@ import (
"github.com/rs/zerolog/pkgerrors" "github.com/rs/zerolog/pkgerrors"
) )
func configureLogger() { func ConfigureLogger() {
zerolog.ErrorStackFieldName = "stack_trace" zerolog.ErrorStackFieldName = "stack_trace"
zerolog.ErrorStackMarshaler = pkgerrors.MarshalStack zerolog.ErrorStackMarshaler = pkgerrors.MarshalStack
zerolog.TimeFieldFormat = zerolog.TimeFormatUnix zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
@ -21,7 +21,7 @@ func configureLogger() {
log.Logger = log.Logger.With().Caller().Stack().Logger() log.Logger = log.Logger.With().Caller().Stack().Logger()
} }
func setLoggingLevel(level string) { func SetLoggingLevel(level string) {
switch level { switch level {
case "ERROR": case "ERROR":
zerolog.SetGlobalLevel(zerolog.ErrorLevel) zerolog.SetGlobalLevel(zerolog.ErrorLevel)
@ -34,7 +34,7 @@ func setLoggingLevel(level string) {
} }
} }
func setLoggingMode(mode string) { func SetLoggingMode(mode string) {
switch mode { switch mode {
case "PRETTY": case "PRETTY":
log.Logger = log.Output(zerolog.ConsoleWriter{ log.Logger = log.Output(zerolog.ConsoleWriter{