Merge pull request #952 from sdowell/null-err-log

k8s-ci-robot · web-flow · commit 534976a97c3b · 2025-06-16T23:57:04.000-07:00
fix: gracefully handle nil err in Logger
diff --git a/pkg/logging/logging.go b/pkg/logging/logging.go
@@ -57,9 +57,11 @@ func (l *Logger) Error(err error, msg string, kvList ...interface{}) {
 		Args map[string]interface{}
 	}{
 		Msg:  msg,
-		Err:  err.Error(),
 		Args: map[string]interface{}{},
 	}
+	if err != nil {
+		payload.Err = err.Error()
+	}
 	if len(kvList)%2 != 0 {
 		kvList = append(kvList, "<no-value>")
 	}

Original file line number	Diff line number	Diff line change
`@@ -57,9 +57,11 @@ func (l *Logger) Error(err error, msg string, kvList ...interface{}) {`
`57`	`57`	`Args map[string]interface{}`
`58`	`58`	`}{`
`59`	`59`	`Msg: msg,`
`60`		`- Err: err.Error(),`
`61`	`60`	`Args: map[string]interface{}{},`
`62`	`61`	`}`
	`62`	`+ if err != nil {`
	`63`	`+ payload.Err = err.Error()`
	`64`	`+ }`
`63`	`65`	`if len(kvList)%2 != 0 {`
`64`	`66`	`kvList = append(kvList, "<no-value>")`
`65`	`67`	`}`