glenux-archive/spf13--viper
1
0
Fork 0
mirror of https://github.com/spf13/viper synced 2024-12-23 20:17:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

#73 Avoid searching CWD if no config in provided dirs

Browse source
This commit is contained in:
Vlad Didenko 2015-05-23 01:20:20 -05:00
parent d62d4bb4c6
commit 3f164ab4ca
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
viper.go
View file

@ -50,7 +50,7 @@ type UnsupportedConfigError string
// Returns the formatted configuration error. // Returns the formatted configuration error.
func (str UnsupportedConfigError) Error() string { func (str UnsupportedConfigError) Error() string {
return fmt.Sprintf("Unsupported Config Type %q", string(str)) return fmt.Sprintf("Unsupported Config Type %q or Config File Not Found", string(str))
} }
// Denotes encountering an unsupported remote // Denotes encountering an unsupported remote
@ -967,13 +967,17 @@ func (v *Viper) findConfigFile() (string, error) {
} }
} }
if len(v.configPaths) > 0 {
return "", fmt.Errorf("Config file not found in: %s", v.configPaths)
}
// try the current working directory // try the current working directory
wd, _ := os.Getwd() wd, _ := os.Getwd()
file := v.searchInPath(wd) file := v.searchInPath(wd)
if file != "" { if file != "" {
return file, nil return file, nil
} }
return "", fmt.Errorf("config file not found in: %s", v.configPaths) return "", fmt.Errorf("config file not found in the current working directory %q", wd)
} }
// Prints all configuration registries for debugging // Prints all configuration registries for debugging