Fix configuration reporting (#142)

nfx · Jul 30, 2023 · 954c8b7 · 954c8b7
1 parent 596413f
commit 954c8b7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,4 @@ coverage.txt
 slrp
 package-lock.json
 .vagrant
+*.patch
diff --git a/app/config.go b/app/config.go
@@ -118,15 +118,13 @@ func getConfig() (configuration, error) {
 		validLoc = loc
 		break
 	}
-	os.Stderr.WriteString(fmt.Sprintf("Loading config: %s\n", validLoc))
 	data := configuration{}
-	err = yaml.Unmarshal(raw, &data)
-	if err != nil {
-		return nil, fmt.Errorf("invalid config in %s: %w", validLoc, err)
-	}
-	if data == nil {
-		// when there's no config
-		data = configuration{}
+	if validLoc != "" {
+		os.Stderr.WriteString(fmt.Sprintf("Loading config: %s\n", validLoc))
+		err = yaml.Unmarshal(raw, &data)
+		if err != nil {
+			return nil, fmt.Errorf("invalid config in %s: %w", validLoc, err)
+		}
 	}
 	for _, raw := range os.Environ() {
 		rawSplit := strings.SplitN(raw, "=", 2)
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,3 +20,4 @@ coverage.txt @@
     slrp
     package-lock.json
     .vagrant
+    *.patch