norohind/dive-zfs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #266 from abitrolly/confix

Browse Source 
Do not ignore missing file from --config option (fixes #265)
This commit is contained in:
Alex Goodman 2020-02-09 10:47:52 -05:00 committed by GitHub
commit 04038ecac9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmd/root.go
View File

@ -66,9 +66,6 @@ func initCli() {
// initConfig reads in config file and ENV variables if set. // initConfig reads in config file and ENV variables if set.
func initConfig() { func initConfig() {
filepathToCfg := getCfgFile(cfgFile)
viper.SetConfigFile(filepathToCfg)
viper.SetDefault("log.level", log.InfoLevel.String()) viper.SetDefault("log.level", log.InfoLevel.String())
viper.SetDefault("log.path", "./dive.log") viper.SetDefault("log.path", "./dive.log")
viper.SetDefault("log.enabled", false) viper.SetDefault("log.enabled", false)
@ -105,9 +102,20 @@ func initConfig() {
viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_")) viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_"))
viper.AutomaticEnv() viper.AutomaticEnv()
// If a config file is found, read it in. // if config files are present, load them
if err := viper.ReadInConfig(); err == nil { if cfgFile == "" {
// default configs are ignored if not found
filepathToCfg := getDefaultCfgFile()
viper.SetConfigFile(filepathToCfg)
} else {
viper.SetConfigFile(cfgFile)
}
err := viper.ReadInConfig()
if err == nil {
fmt.Println("Using config file:", viper.ConfigFileUsed()) fmt.Println("Using config file:", viper.ConfigFileUsed())
} else if cfgFile != "" {
fmt.Println(err)
os.Exit(0)
} }
// set global defaults (for performance) // set global defaults (for performance)
@ -147,14 +155,10 @@ func initLogging() {
} }
} }
// getCfgFile checks for config file in paths from xdg specs // getDefaultCfgFile checks for config file in paths from xdg specs
// and in $HOME/.config/dive/ directory // and in $HOME/.config/dive/ directory
// defaults to $HOME/.dive.yaml // defaults to $HOME/.dive.yaml
func getCfgFile(fromFlag string) string { func getDefaultCfgFile() string {
if fromFlag != "" {
return fromFlag
}
home, err := homedir.Dir() home, err := homedir.Dir()
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)