From 2e78e00a0ba9217975e3c815af532e3c49079eeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Mon, 14 Mar 2022 13:00:27 +0100 Subject: [PATCH] Manager: don't log an error when the config file doesn't exist The configuration file is expected to not exist on many systems, and thus logging an error (even when it's a very innocent one) will cause confusion. --- cmd/flamenco-manager/main.go | 2 +- internal/manager/config/settings.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/flamenco-manager/main.go b/cmd/flamenco-manager/main.go index 0a747b4c..15be6c3e 100644 --- a/cmd/flamenco-manager/main.go +++ b/cmd/flamenco-manager/main.go @@ -62,7 +62,7 @@ func main() { // Load configuration. configService := config.NewService() err := configService.Load() - if err != nil { + if err != nil && !os.IsNotExist(err) { log.Error().Err(err).Msg("loading configuration") } diff --git a/internal/manager/config/settings.go b/internal/manager/config/settings.go index 38c19fce..449d8508 100644 --- a/internal/manager/config/settings.go +++ b/internal/manager/config/settings.go @@ -192,13 +192,13 @@ func loadConf(filename string) (Conf, error) { log.Info().Str("file", filename).Msg("loading configuration") yamlFile, err := os.ReadFile(filename) if err != nil { - var level zerolog.Level + var evt *zerolog.Event if os.IsNotExist(err) { - level = zerolog.DebugLevel + evt = log.Debug() } else { - level = zerolog.WarnLevel + evt = log.Warn().Err(err) } - log.WithLevel(level).Err(err).Msg("unable to load configuration, using defaults") + evt.Msg("unable to load configuration, using defaults") return DefaultConfig(), err }