mirror of
https://github.com/spf13/viper
synced 2024-12-22 11:37:02 +00:00
refactor: move old config search code
Signed-off-by: Mark Sagi-Kazar <mark.sagikazar@gmail.com>
This commit is contained in:
parent
b206f2075e
commit
df70866789
1 changed files with 20 additions and 15 deletions
35
file.go
35
file.go
|
@ -16,21 +16,7 @@ func ExperimentalFinder() Option {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func (v *Viper) findConfigFileWithFinder(finder Finder) (string, error) {
|
// Search for a config file.
|
||||||
results, err := finder.Find(v.fs)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(results) == 0 {
|
|
||||||
return "", ConfigFileNotFoundError{v.configName, fmt.Sprintf("%s", v.configPaths)}
|
|
||||||
}
|
|
||||||
|
|
||||||
return results[0], nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Search all configPaths for any config file.
|
|
||||||
// Returns the first path that exists (and is a config file).
|
|
||||||
func (v *Viper) findConfigFile() (string, error) {
|
func (v *Viper) findConfigFile() (string, error) {
|
||||||
finder := v.finder
|
finder := v.finder
|
||||||
|
|
||||||
|
@ -54,6 +40,25 @@ func (v *Viper) findConfigFile() (string, error) {
|
||||||
return v.findConfigFileWithFinder(finder)
|
return v.findConfigFileWithFinder(finder)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return v.findConfigFileOld()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (v *Viper) findConfigFileWithFinder(finder Finder) (string, error) {
|
||||||
|
results, err := finder.Find(v.fs)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(results) == 0 {
|
||||||
|
return "", ConfigFileNotFoundError{v.configName, fmt.Sprintf("%s", v.configPaths)}
|
||||||
|
}
|
||||||
|
|
||||||
|
return results[0], nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Search all configPaths for any config file.
|
||||||
|
// Returns the first path that exists (and is a config file).
|
||||||
|
func (v *Viper) findConfigFileOld() (string, error) {
|
||||||
v.logger.Info("searching for config in paths", "paths", v.configPaths)
|
v.logger.Info("searching for config in paths", "paths", v.configPaths)
|
||||||
|
|
||||||
for _, cp := range v.configPaths {
|
for _, cp := range v.configPaths {
|
||||||
|
|
Loading…
Reference in a new issue