From 2e1acd587e49d7ca97d97cad11607a971292c60a Mon Sep 17 00:00:00 2001 From: Yoann La Cancellera Date: Thu, 8 Feb 2024 19:56:56 +0100 Subject: [PATCH] pt-galera-log-explainer: fix debug log formatting mismatch "extrator" log was not using the same output format as the rest beacuse it was initialized before main() --- src/go/pt-galera-log-explainer/internal.go | 7 ++++--- src/go/pt-galera-log-explainer/main.go | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/go/pt-galera-log-explainer/internal.go b/src/go/pt-galera-log-explainer/internal.go index 0ba677db..a982b0e4 100644 --- a/src/go/pt-galera-log-explainer/internal.go +++ b/src/go/pt-galera-log-explainer/internal.go @@ -12,13 +12,14 @@ import ( "github.com/percona/percona-toolkit/src/go/pt-galera-log-explainer/types" "github.com/percona/percona-toolkit/src/go/pt-galera-log-explainer/utils" "github.com/pkg/errors" + "github.com/rs/zerolog" "github.com/rs/zerolog/log" ) -var logger = log.With().Str("component", "extractor").Logger() - -func init() { +var logger zerolog.Logger +func initComponentLogger() { + logger = log.With().Str("component", "extractor").Logger() if CLI.Since != nil { logger = logger.With().Time("since", *CLI.Since).Logger() } diff --git a/src/go/pt-galera-log-explainer/main.go b/src/go/pt-galera-log-explainer/main.go index 888e8e5d..f3e94d19 100644 --- a/src/go/pt-galera-log-explainer/main.go +++ b/src/go/pt-galera-log-explainer/main.go @@ -62,6 +62,7 @@ func main() { zerolog.TimeFieldFormat = zerolog.TimeFormatUnix zerolog.SetGlobalLevel(zerolog.InfoLevel) log.Logger = zerolog.New(zerolog.ConsoleWriter{Out: os.Stderr, NoColor: CLI.NoColor, FormatTimestamp: func(_ interface{}) string { return "" }}) + initComponentLogger() if CLI.Verbosity == types.Debug { zerolog.SetGlobalLevel(zerolog.DebugLevel) }