arno/clair
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

config: fix default fallback

Browse Source
This commit is contained in:
Jimmy Zelinskie 2016-03-17 14:52:41 -04:00
parent 19b730ea67
commit 20af787437
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/config.go
View File

@ -66,7 +66,8 @@ type APIConfig struct {
} }
// DefaultConfig is a configuration that can be used as a fallback value. // DefaultConfig is a configuration that can be used as a fallback value.
var DefaultConfig = Config{ func DefaultConfig() Config {
return Config{
Database: &DatabaseConfig{ Database: &DatabaseConfig{
CacheSize: 16384, CacheSize: 16384,
}, },
@ -82,12 +83,14 @@ var DefaultConfig = Config{
Attempts: 5, Attempts: 5,
RenotifyInterval: 2 * time.Hour, RenotifyInterval: 2 * time.Hour,
}, },
}
} }
// Load is a shortcut to open a file, read it, and generate a Config. // Load is a shortcut to open a file, read it, and generate a Config.
// It supports relative and absolute paths. Given "", it returns DefaultConfig. // It supports relative and absolute paths. Given "", it returns DefaultConfig.
func Load(path string) (config *Config, err error) { func Load(path string) (config *Config, err error) {
config = &DefaultConfig var cfgFile File
cfgFile.Clair = DefaultConfig()
if path == "" { if path == "" {
return return
} }
@ -103,7 +106,6 @@ func Load(path string) (config *Config, err error) {
return return
} }
var cfgFile File
err = yaml.Unmarshal(d, &cfgFile) err = yaml.Unmarshal(d, &cfgFile)
if err != nil { if err != nil {
return return