From f54267b52344bb4d1f4cfc69079ce1ad88e8e599 Mon Sep 17 00:00:00 2001 From: Cory Bennett Date: Tue, 2 Aug 2016 19:20:23 -0700 Subject: [PATCH] load configs in order of closest to cwd (/etc/go-jira.yml is last) --- main/main.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/main/main.go b/main/main.go index d1e2830..d049098 100644 --- a/main/main.go +++ b/main/main.go @@ -481,7 +481,9 @@ Command Options: func parseYaml(file string, opts map[string]interface{}) { if fh, err := ioutil.ReadFile(file); err == nil { log.Debugf("Found Config file: %s", file) - yaml.Unmarshal(fh, &opts) + if err := yaml.Unmarshal(fh, &opts); err != nil { + log.Errorf("Unable to parse %s: %s", file, err) + } } } @@ -509,10 +511,10 @@ func loadConfigs(opts map[string]interface{}) { populateEnv(opts) paths := jira.FindParentPaths(".jira.d/config.yml") // prepend - paths = append([]string{"/etc/go-jira.yml"}, paths...) + paths = append(paths, "/etc/go-jira.yml") // iterate paths in reverse - for i := len(paths) - 1; i >= 0; i-- { + for i := 0; i < len(paths); i++ { file := paths[i] if stat, err := os.Stat(file); err == nil { tmp := make(map[string]interface{})