Do not print log level on CLI (#2638)

if it's not in debug log level

closes https://github.com/woodpecker-ci/woodpecker/issues/1764
This commit is contained in:
qwerty287 2023-10-24 12:23:42 +02:00 committed by GitHub
parent a1a35eb7be
commit d5e68efc95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 9 deletions

View file

@ -21,6 +21,6 @@ import (
)
func SetupGlobalLogger(c *cli.Context) error {
common.SetupGlobalLogger(c)
common.SetupGlobalLogger(c, false)
return nil
}

View file

@ -49,7 +49,7 @@ import (
)
func run(c *cli.Context) error {
common.SetupGlobalLogger(c)
common.SetupGlobalLogger(c, true)
agentConfigPath := c.String("agent-config")
hostname := c.String("hostname")

View file

@ -41,6 +41,7 @@ func newApp() *cli.App {
app.Usage = "command line utility"
app.EnableBashCompletion = true
app.Flags = common.GlobalFlags
app.Before = common.SetupGlobalLogger
app.Commands = []*cli.Command{
pipeline.Command,
log.Command,
@ -56,9 +57,5 @@ func newApp() *cli.App {
cron.Command,
}
for _, command := range app.Commands {
command.Before = common.SetupGlobalLogger
}
return app
}

View file

@ -51,7 +51,7 @@ var GlobalLoggerFlags = []cli.Flag{
},
}
func SetupGlobalLogger(c *cli.Context) {
func SetupGlobalLogger(c *cli.Context, printLvl bool) {
logLevel := c.String("log-level")
pretty := c.Bool("pretty")
noColor := c.Bool("nocolor")
@ -96,5 +96,7 @@ func SetupGlobalLogger(c *cli.Context) {
log.Logger = log.With().Caller().Logger()
}
log.Info().Msgf("LogLevel = %s", zerolog.GlobalLevel().String())
if printLvl {
log.Info().Msgf("LogLevel = %s", zerolog.GlobalLevel().String())
}
}

View file

@ -55,7 +55,7 @@ import (
)
func run(c *cli.Context) error {
common.SetupGlobalLogger(c)
common.SetupGlobalLogger(c, true)
// set gin mode based on log level
if zerolog.GlobalLevel() > zerolog.DebugLevel {