Skip to content
This repository was archived by the owner on Jul 15, 2018. It is now read-only.

Commit 6944756

Browse files
committed
encode complex types as "%+v" (Refs #18)
1 parent ac0cf0b commit 6944756

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

log/tmfmt_logger.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ type tmfmtLogger struct {
3535
}
3636

3737
// NewTMFmtLogger returns a logger that encodes keyvals to the Writer in
38-
// Tendermint custom format.
38+
// Tendermint custom format. Note complex types (structs, maps, slices)
39+
// formatted as "%+v".
3940
//
4041
// Each log event produces no more than one call to w.Write.
4142
// The passed Writer must be safe for concurrent use by multiple goroutines if
@@ -103,7 +104,10 @@ KeyvalueLoop:
103104
}
104105
}
105106

106-
if err := enc.EncodeKeyval(keyvals[i], keyvals[i+1]); err != nil {
107+
err := enc.EncodeKeyval(keyvals[i], keyvals[i+1])
108+
if err == logfmt.ErrUnsupportedValueType {
109+
enc.EncodeKeyval(keyvals[i], fmt.Sprintf("%+v", keyvals[i+1]))
110+
} else if err != nil {
107111
return err
108112
}
109113
}

log/tmfmt_logger_test.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ func TestTMFmtLogger(t *testing.T) {
3030
assert.Regexp(t, regexp.MustCompile(`N\[.+\] unknown \s+ a=1 err=error\n$`), buf.String())
3131

3232
buf.Reset()
33-
err := logger.Log("std_map", map[int]int{1: 2}, "my_map", mymap{0: 0})
34-
assert.NotNil(t, err)
33+
if err := logger.Log("std_map", map[int]int{1: 2}, "my_map", mymap{0: 0}); err != nil {
34+
t.Fatal(err)
35+
}
36+
assert.Regexp(t, regexp.MustCompile(`N\[.+\] unknown \s+ std_map=map\[1:2\] my_map=special_behavior\n$`), buf.String())
3537

3638
buf.Reset()
3739
if err := logger.Log("level", "error"); err != nil {

0 commit comments

Comments
 (0)