Skip to content

Commit

Permalink
fix: Load root dir before loading config (#2266)
Browse files Browse the repository at this point in the history
## Relevant issue(s)

Resolves #2264 

## Description

This PR ensures that the root dir path gets defined prior to looking for
a config file. It fixes an issue where the config file wasn't being
loaded on node start.
  • Loading branch information
fredcarle authored Jan 29, 2024
1 parent 6f53af2 commit 4da6ed0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 3 additions & 0 deletions cli/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ func setStoreContext(cmd *cobra.Command, cfg *config.Config) error {
// loadConfig loads the rootDir containing the configuration file,
// otherwise warn about it and load a default configuration.
func loadConfig(cfg *config.Config) error {
if err := cfg.LoadRootDirFromFlagOrDefault(); err != nil {
return err
}
return cfg.LoadWithRootdir(cfg.ConfigFileExists())
}

Expand Down
4 changes: 0 additions & 4 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,6 @@ func (cfg *Config) LoadWithRootdir(withRootdir bool) error {
return err
}

if err := cfg.LoadRootDirFromFlagOrDefault(); err != nil {
return err
}

if withRootdir {
if err := cfg.v.ReadInConfig(); err != nil {
return NewErrReadingConfigFile(err)
Expand Down

0 comments on commit 4da6ed0

Please sign in to comment.