From b33db33d172aaf66eec5b7b016d0b22cdba7acf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 11 Mar 2022 10:51:22 +0100 Subject: [PATCH] Manager: show error when there was an error loading configuration --- cmd/flamenco-manager/main.go | 5 ++++- internal/manager/config/settings.go | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cmd/flamenco-manager/main.go b/cmd/flamenco-manager/main.go index b5bdd96a..0a747b4c 100644 --- a/cmd/flamenco-manager/main.go +++ b/cmd/flamenco-manager/main.go @@ -61,7 +61,10 @@ func main() { // Load configuration. configService := config.NewService() - configService.Load() + err := configService.Load() + if err != nil { + log.Error().Err(err).Msg("loading configuration") + } // TODO: enable TLS via Let's Encrypt. listen := configService.Get().Listen diff --git a/internal/manager/config/settings.go b/internal/manager/config/settings.go index f6467e7c..38c19fce 100644 --- a/internal/manager/config/settings.go +++ b/internal/manager/config/settings.go @@ -12,6 +12,7 @@ import ( "strings" "time" + "github.com/rs/zerolog" "github.com/rs/zerolog/log" yaml "gopkg.in/yaml.v2" ) @@ -191,6 +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 + if os.IsNotExist(err) { + level = zerolog.DebugLevel + } else { + level = zerolog.WarnLevel + } + log.WithLevel(level).Err(err).Msg("unable to load configuration, using defaults") return DefaultConfig(), err }