Browse Source

log: Tm -> TM

pull/1842/head
Ethan Buchman 7 years ago
committed by Anton Kaliaev
parent
commit
66c9401c07
No known key found for this signature in database GPG Key ID: 7B6881D965918214
4 changed files with 19 additions and 19 deletions
  1. +3
    -3
      log/tm_logger.go
  2. +6
    -6
      log/tm_logger_test.go
  3. +2
    -2
      log/tmfmt_logger.go
  4. +8
    -8
      log/tmfmt_logger_test.go

+ 3
- 3
log/tm_logger.go View File

@ -17,10 +17,10 @@ type tmLogger struct {
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
// 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
colorFn := func(keyvals ...interface{}) term.FgBgColor {
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())
return &tmLogger{srcLogger}
}


+ 6
- 6
log/tm_logger_test.go View File

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


+ 2
- 2
log/tmfmt_logger.go View File

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


+ 8
- 8
log/tmfmt_logger_test.go View File

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


Loading…
Cancel
Save