re
/
viper
forked from mirror/viper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

return more useful error if config file is missing 

Signed-off-by: Joshua Rubin <jrubin@zvelo.com>
This commit is contained in:
Joshua Rubin 2014-04-08 16:57:45 -06:00 committed by spf13
parent 25817ada59
commit 1a2e68e1bc
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
viper.go
View File

@ -197,16 +197,25 @@ func Set(key string, value interface{}) {
override[key] = value override[key] = value
} }
func ReadInConfig() { type UnsupportedConfigError string
func (str UnsupportedConfigError) Error() string {
return fmt.Sprintf("Unsupported Config Type %q", string(str))
}
func ReadInConfig() error {
jww.INFO.Println("Attempting to read in config file") jww.INFO.Println("Attempting to read in config file")
if !stringInSlice(getConfigType(), SupportedExts) { if !stringInSlice(getConfigType(), SupportedExts) {
jww.ERROR.Fatalf("Unsupported Config Type %q", getConfigType()) return UnsupportedConfigError(getConfigType())
} }
file, err := ioutil.ReadFile(getConfigFile()) file, err := ioutil.ReadFile(getConfigFile())
if err == nil { if err != nil {
MarshallReader(bytes.NewReader(file)) return err
} }
MarshallReader(bytes.NewReader(file))
return nil
} }
func MarshallReader(in io.Reader) { func MarshallReader(in io.Reader) {
@ -276,12 +285,11 @@ func getConfigFile() string {
cf, err := findConfigFile() cf, err := findConfigFile()
if err != nil { if err != nil {
jww.ERROR.Println(err) return ""
} else {
configFile = cf
return getConfigFile()
} }
return ""
configFile = cf
return getConfigFile()
} }
func searchInPath(in string) (filename string) { func searchInPath(in string) (filename string) {