Implement log feedback and fix broken CI (goss-org#844)

* Implement log feedback and fix broken CI * Default programatic log level to ERROR (FATAL no longer exists)
quicklyon · Oct 6, 2023 · 3a16622 · 3a16622
1 parent ed3be13
commit 3a16622
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/goss_config.go b/goss_config.go
@@ -112,13 +112,12 @@ func (c *GossConfig) Merge(g2 GossConfig) {
 }
 
 func mergeType[V any](m map[string]V, t, k string, v V) {
-		if _, ok := m[k]; ok {
-			log.Printf("[WARN] Duplicate key detected: '%s: %s'. The value from a later-loaded goss file has overwritten the previous value.", t, k)
-		}
-		m[k] = v
+	if _, ok := m[k]; ok {
+		log.Printf("[WARN] Duplicate key detected: '%s: %s'. The value from a later-loaded goss file has overwritten the previous value.", t, k)
+	}
+	m[k] = v
 }
 
-
 func (c *GossConfig) Resources() []resource.Resource {
 	var tests []resource.Resource
 

diff --git a/system/command.go b/system/command.go
@@ -55,8 +55,8 @@ func (c *DefCommand) setup() error {
 	stdoutB := cmd.Stdout.Bytes()
 	stderrB := cmd.Stderr.Bytes()
 	id := c.Ctx.Value("id")
-	logBytes(stdoutB, fmt.Sprintf("Command: %s: stdout: ", id))
-	logBytes(stderrB, fmt.Sprintf("Command: %s: stderr: ", id))
+	logBytes(stdoutB, fmt.Sprintf("[Command][%s][stdout] ", id))
+	logBytes(stderrB, fmt.Sprintf("[Command][%s][stderr] ", id))
 	c.stdout = bytes.NewReader(stdoutB)
 	c.stderr = bytes.NewReader(stderrB)
 

diff --git a/system/log.go b/system/log.go
@@ -11,6 +11,6 @@ func logBytes(b []byte, prefix string) {
 	}
 	lines := bytes.Split(b, []byte("\n"))
 	for _, l := range lines {
-		log.Printf("[DEBUG] %s %s", prefix, l)
+		log.Printf("[DEBUG]%s %s", prefix, l)
 	}
 }
diff --git a/util/config.go b/util/config.go
@@ -75,7 +75,7 @@ func NewConfig(opts ...ConfigOption) (rc *Config, err error) {
 		DisabledResourceTypes: []string{},
 		ListenAddress:         ":8080",
 		LocalAddress:          "",
-		LogLevel:              "FATAL",
+		LogLevel:              "ERROR",
 		MaxConcurrent:         50,
 		NoColor:               nil,
 		NoFollowRedirects:     false,