Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 17:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 83

Only attempt to parse config file if it is specified by flag (#169)

Browse source 
Previously, the behavior was to search for the config file in a variety of
locations. Now we only attempt to load a config file if it has been explicitly
specified with `-c` or `--config`.

Fixes #165.
This commit is contained in:
Zachary Wasserman 2016-09-15 08:44:05 -07:00 committed by GitHub
parent df19fd4b7c
commit 0702dccb7f
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cli/root.go
View file

@ -46,7 +46,7 @@ wish to override the default value.
`,
}
rootCmd.PersistentFlags().String("config", "", "Path to a configuration file")
rootCmd.PersistentFlags().StringP("config", "c", "", "Path to a configuration file")
return rootCmd
}

21
config/config.go
View file

@ -323,19 +323,17 @@ func (man Manager) getConfigDuration(key string) time.Duration {
// loadConfigFile handles the loading of the config file.
func (man Manager) loadConfigFile() {
configFile := man.command.PersistentFlags().Lookup("config").Value.String()
if configFile != "" {
man.viper.SetConfigFile(configFile)
} else {
man.viper.SetConfigName("kolide")
man.viper.AddConfigPath(".")
man.viper.AddConfigPath("$HOME")
man.viper.AddConfigPath("./tools/app")
man.viper.AddConfigPath("/etc/kolide")
}
man.viper.SetConfigType("yaml")
configFile := man.command.PersistentFlags().Lookup("config").Value.String()
if configFile == "" {
// No config file set, only use configs from env
// vars/flags/defaults
return
}
man.viper.SetConfigFile(configFile)
err := man.viper.ReadInConfig()
fmt.Println("Using config file: ", man.viper.ConfigFileUsed())
@ -343,7 +341,6 @@ func (man Manager) loadConfigFile() {
if err != nil {
panic("Error reading config: " + err.Error())
}
}
// TestConfig returns a barebones configuration suitable for use in tests.