certusone
/
tendermint
mirror of https://github.com/certusone/tendermint.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

encode complex types as "%+v" (Refs #18)

This commit is contained in:
Anton Kaliaev 2017-11-06 15:44:21 -05:00
parent ac0cf0b2e2
commit 69447564b8
No known key found for this signature in database
GPG Key ID: 7B6881D965918214
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
log/tmfmt_logger.go
View File

@ -35,7 +35,8 @@ type tmfmtLogger struct {
} }
// NewTMFmtLogger returns a logger that encodes keyvals to the Writer in // NewTMFmtLogger returns a logger that encodes keyvals to the Writer in
// Tendermint custom format. // Tendermint custom format. Note complex types (structs, maps, slices)
// formatted as "%+v".
// //
// Each log event produces no more than one call to w.Write. // Each log event produces no more than one call to w.Write.
// The passed Writer must be safe for concurrent use by multiple goroutines if // The passed Writer must be safe for concurrent use by multiple goroutines if
@ -103,7 +104,10 @@ KeyvalueLoop:
} }
} }
if err := enc.EncodeKeyval(keyvals[i], keyvals[i+1]); err != nil { err := enc.EncodeKeyval(keyvals[i], keyvals[i+1])
if err == logfmt.ErrUnsupportedValueType {
enc.EncodeKeyval(keyvals[i], fmt.Sprintf("%+v", keyvals[i+1]))
} else if err != nil {
return err return err
} }
} }

6
log/tmfmt_logger_test.go
View File

@ -30,8 +30,10 @@ func TestTMFmtLogger(t *testing.T) {
assert.Regexp(t, regexp.MustCompile(`N\[.+\] unknown \s+ a=1 err=error\n$`), buf.String()) assert.Regexp(t, regexp.MustCompile(`N\[.+\] unknown \s+ a=1 err=error\n$`), buf.String())
buf.Reset() buf.Reset()
err := logger.Log("std_map", map[int]int{1: 2}, "my_map", mymap{0: 0}) if err := logger.Log("std_map", map[int]int{1: 2}, "my_map", mymap{0: 0}); err != nil {
assert.NotNil(t, err) t.Fatal(err)
}
assert.Regexp(t, regexp.MustCompile(`N\[.+\] unknown \s+ std_map=map\[1:2\] my_map=special_behavior\n$`), buf.String())
buf.Reset() buf.Reset()
if err := logger.Log("level", "error"); err != nil { if err := logger.Log("level", "error"); err != nil {