fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-20 16:36:31 +00:00
Code Issues Projects Releases Wiki Activity

log: Tm -> TM

Browse Source
This commit is contained in:
Ethan Buchman
2017-05-02 14:26:00 -04:00
committed by Anton Kaliaev
parent ed76afd409
commit 66c9401c07
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
log/tm_logger.go
View File

@ -17,10 +17,10 @@ type tmLogger struct {
srcLogger kitlog.Logger srcLogger kitlog.Logger
} }
// NewTmTermLogger returns a logger that encodes msg and keyvals to the Writer // NewTMTermLogger returns a logger that encodes msg and keyvals to the Writer
// using go-kit's log as an underlying logger and our custom formatter. Note // using go-kit's log as an underlying logger and our custom formatter. Note
// that underlying logger could be swapped with something else. // that underlying logger could be swapped with something else.
func NewTmLogger(w io.Writer) Logger { func NewTMLogger(w io.Writer) Logger {
// Color by level value // Color by level value
colorFn := func(keyvals ...interface{}) term.FgBgColor { colorFn := func(keyvals ...interface{}) term.FgBgColor {
if keyvals[0] != level.Key() { if keyvals[0] != level.Key() {
@ -36,7 +36,7 @@ func NewTmLogger(w io.Writer) Logger {
} }
} }
srcLogger := term.NewLogger(w, NewTmfmtLogger, colorFn) srcLogger := term.NewLogger(w, NewTMFmtLogger, colorFn)
srcLogger = level.NewFilter(srcLogger, level.AllowInfo()) srcLogger = level.NewFilter(srcLogger, level.AllowInfo())
return &tmLogger{srcLogger} return &tmLogger{srcLogger}
} }

12
log/tm_logger_test.go
View File

@ -7,9 +7,9 @@ import (
"github.com/tendermint/tmlibs/log" "github.com/tendermint/tmlibs/log"
) )
func TestTmLogger(t *testing.T) { func TestTMLogger(t *testing.T) {
t.Parallel() t.Parallel()
logger := log.NewTmLogger(ioutil.Discard) logger := log.NewTMLogger(ioutil.Discard)
if err := logger.Info("Hello", "abc", 123); err != nil { if err := logger.Info("Hello", "abc", 123); err != nil {
t.Error(err) t.Error(err)
} }
@ -18,12 +18,12 @@ func TestTmLogger(t *testing.T) {
} }
} }
func BenchmarkTmLoggerSimple(b *testing.B) { func BenchmarkTMLoggerSimple(b *testing.B) {
benchmarkRunner(b, log.NewTmLogger(ioutil.Discard), baseInfoMessage) benchmarkRunner(b, log.NewTMLogger(ioutil.Discard), baseInfoMessage)
} }
func BenchmarkTmLoggerContextual(b *testing.B) { func BenchmarkTMLoggerContextual(b *testing.B) {
benchmarkRunner(b, log.NewTmLogger(ioutil.Discard), withInfoMessage) benchmarkRunner(b, log.NewTMLogger(ioutil.Discard), withInfoMessage)
} }
func benchmarkRunner(b *testing.B, logger log.Logger, f func(log.Logger)) { func benchmarkRunner(b *testing.B, logger log.Logger, f func(log.Logger)) {

4
log/tmfmt_logger.go
View File

@ -34,13 +34,13 @@ type tmfmtLogger struct {
w io.Writer w io.Writer
} }
// 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.
// //
// 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
// the returned Logger will be used concurrently. // the returned Logger will be used concurrently.
func NewTmfmtLogger(w io.Writer) kitlog.Logger { func NewTMFmtLogger(w io.Writer) kitlog.Logger {
return &tmfmtLogger{w} return &tmfmtLogger{w}
} }

16
log/tmfmt_logger_test.go
View File

@ -13,10 +13,10 @@ import (
"github.com/tendermint/tmlibs/log" "github.com/tendermint/tmlibs/log"
) )
func TestTmfmtLogger(t *testing.T) { func TestTMFmtLogger(t *testing.T) {
t.Parallel() t.Parallel()
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
logger := log.NewTmfmtLogger(buf) logger := log.NewTMFmtLogger(buf)
if err := logger.Log("hello", "world"); err != nil { if err := logger.Log("hello", "world"); err != nil {
t.Fatal(err) t.Fatal(err)
@ -46,17 +46,17 @@ func TestTmfmtLogger(t *testing.T) {
assert.Regexp(t, regexp.MustCompile(`N\[.+\] Hello \s+\n$`), buf.String()) assert.Regexp(t, regexp.MustCompile(`N\[.+\] Hello \s+\n$`), buf.String())
} }
func BenchmarkTmfmtLoggerSimple(b *testing.B) { func BenchmarkTMFmtLoggerSimple(b *testing.B) {
benchmarkRunnerKitlog(b, log.NewTmfmtLogger(ioutil.Discard), baseMessage) benchmarkRunnerKitlog(b, log.NewTMFmtLogger(ioutil.Discard), baseMessage)
} }
func BenchmarkTmfmtLoggerContextual(b *testing.B) { func BenchmarkTMFmtLoggerContextual(b *testing.B) {
benchmarkRunnerKitlog(b, log.NewTmfmtLogger(ioutil.Discard), withMessage) benchmarkRunnerKitlog(b, log.NewTMFmtLogger(ioutil.Discard), withMessage)
} }
func TestTmfmtLoggerConcurrency(t *testing.T) { func TestTMFmtLoggerConcurrency(t *testing.T) {
t.Parallel() t.Parallel()
testConcurrency(t, log.NewTmfmtLogger(ioutil.Discard), 10000) testConcurrency(t, log.NewTMFmtLogger(ioutil.Discard), 10000)
} }
func benchmarkRunnerKitlog(b *testing.B, logger kitlog.Logger, f func(kitlog.Logger)) { func benchmarkRunnerKitlog(b *testing.B, logger kitlog.Logger, f func(kitlog.Logger)) {