Enable gocritic and don't ignore globally (#3159)

Use `nolint` directives instead.

From #2960
This commit is contained in:
qwerty287
2024-01-10 15:34:44 +01:00
committed by GitHub
parent aef3f8f3ef
commit 12c40eb957
34 changed files with 170 additions and 161 deletions

View File

@@ -15,6 +15,7 @@
package logger
import (
"fmt"
"io"
"os"
@@ -51,7 +52,7 @@ var GlobalLoggerFlags = []cli.Flag{
},
}
func SetupGlobalLogger(c *cli.Context, printLvl bool) {
func SetupGlobalLogger(c *cli.Context, outputLvl bool) error {
logLevel := c.String("log-level")
pretty := c.Bool("pretty")
noColor := c.Bool("nocolor")
@@ -66,7 +67,7 @@ func SetupGlobalLogger(c *cli.Context, printLvl bool) {
default: // a file was set
openFile, err := logfile.OpenFileWithContext(c.Context, logFile, 0o660)
if err != nil {
log.Fatal().Err(err).Msgf("could not open log file '%s'", logFile)
return fmt.Errorf("could not open log file '%s': %w", logFile, err)
}
file = openFile
noColor = true
@@ -87,7 +88,7 @@ func SetupGlobalLogger(c *cli.Context, printLvl bool) {
lvl, err := zerolog.ParseLevel(logLevel)
if err != nil {
log.Fatal().Msgf("unknown logging level: %s", logLevel)
return fmt.Errorf("unknown logging level: %s", logLevel)
}
zerolog.SetGlobalLevel(lvl)
@@ -96,7 +97,9 @@ func SetupGlobalLogger(c *cli.Context, printLvl bool) {
log.Logger = log.With().Caller().Logger()
}
if printLvl {
if outputLvl {
log.Info().Msgf("LogLevel = %s", zerolog.GlobalLevel().String())
}
return nil
}