Merge pull request influxdata#1577 from influxdata/md-nil-error

Fix panic on nil error field
kprd · Sep 20, 2017 · e5a3d7f · e5a3d7f
2 parents 5d228b2 + a24968a
commit e5a3d7f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/services/diagnostic/internal/log/field.go b/services/diagnostic/internal/log/field.go
@@ -394,7 +394,12 @@ func (s ErrorField) WriteTo(w *bufio.Writer) (n int64, err error) {
 		return
 	}
 
-	m, err = writeString(w, s.err.Error())
+	errStr := "nil"
+	if s.err != nil {
+		errStr = s.err.Error()
+	}
+
+	m, err = writeString(w, errStr)
 	n += int64(m)
 	if err != nil {
 		return

diff --git a/services/diagnostic/internal/log/log_test.go b/services/diagnostic/internal/log/log_test.go
@@ -172,6 +172,15 @@ func TestLoggerWithoutContext(t *testing.T) {
 				log.Error(errors.New("this")),
 			},
 		},
+		{
+			name: "nil error field",
+			exp:  fmt.Sprintf("ts=%s lvl=error msg=test err=nil\n", nowStr),
+			lvl:  "error",
+			msg:  "test",
+			fields: []log.Field{
+				log.Error(nil),
+			},
+		},
 		{
 			name: "complex error field",
 			exp:  fmt.Sprintf("ts=%s lvl=error msg=test err=\"this is \\\" a test/yeah\"\n", nowStr),