From d5e68efc9589f0f91ae548a047f855b18ca990a9 Mon Sep 17 00:00:00 2001
From: qwerty287 <80460567+qwerty287@users.noreply.github.com>
Date: Tue, 24 Oct 2023 12:23:42 +0200
Subject: [PATCH] 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
---
 cli/common/zerologger.go | 2 +-
 cmd/agent/agent.go       | 2 +-
 cmd/cli/app.go           | 5 +----
 cmd/common/logger.go     | 6 ++++--
 cmd/server/server.go     | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/cli/common/zerologger.go b/cli/common/zerologger.go
index 7a1d30e54..2d3e065cd 100644
--- a/cli/common/zerologger.go
+++ b/cli/common/zerologger.go
@@ -21,6 +21,6 @@ import (
 )
 
 func SetupGlobalLogger(c *cli.Context) error {
-	common.SetupGlobalLogger(c)
+	common.SetupGlobalLogger(c, false)
 	return nil
 }
diff --git a/cmd/agent/agent.go b/cmd/agent/agent.go
index 9fde7d28f..aac2a3453 100644
--- a/cmd/agent/agent.go
+++ b/cmd/agent/agent.go
@@ -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")
diff --git a/cmd/cli/app.go b/cmd/cli/app.go
index cda240526..ae291ba13 100644
--- a/cmd/cli/app.go
+++ b/cmd/cli/app.go
@@ -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
 }
diff --git a/cmd/common/logger.go b/cmd/common/logger.go
index 242f9343e..d9b4e9671 100644
--- a/cmd/common/logger.go
+++ b/cmd/common/logger.go
@@ -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())
+	}
 }
diff --git a/cmd/server/server.go b/cmd/server/server.go
index 7b8d8634f..621731986 100644
--- a/cmd/server/server.go
+++ b/cmd/server/server.go
@@ -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 {