From c523032c8649206d6a14297fc214b6ee8a4406e9 Mon Sep 17 00:00:00 2001 From: mihaelabalutoiu Date: Wed, 20 Jul 2022 21:13:05 +0300 Subject: [PATCH] Fix NewConfig function Move the default setting before validating the config, otherwise the code will never run. This happens because the `Validate()` function will always fail when `config.Default.ConfigDir` is empty. --- config/config.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/config.go b/config/config.go index 487c52c5..5b9d9a1f 100644 --- a/config/config.go +++ b/config/config.go @@ -100,12 +100,12 @@ func NewConfig(cfgFile string) (*Config, error) { if _, err := toml.DecodeFile(cfgFile, &config); err != nil { return nil, errors.Wrap(err, "decoding toml") } - if err := config.Validate(); err != nil { - return nil, errors.Wrap(err, "validating config") - } if config.Default.ConfigDir == "" { config.Default.ConfigDir = DefaultConfigDir } + if err := config.Validate(); err != nil { + return nil, errors.Wrap(err, "validating config") + } return &config, nil }