Remove MemLogger, update baseapp
This commit is contained in:
parent
c7cd21955a
commit
ad6c7f0be4
|
@ -210,9 +210,9 @@ func (app *BaseApp) initFromStore(mainKey sdk.StoreKey) error {
|
|||
// NewContext returns a new Context with the correct store, the given header, and nil txBytes.
|
||||
func (app *BaseApp) NewContext(isCheckTx bool, header abci.Header) sdk.Context {
|
||||
if isCheckTx {
|
||||
return sdk.NewContext(app.checkState.ms, header, true, nil, log.NewNopLogger())
|
||||
return sdk.NewContext(app.checkState.ms, header, true, nil, app.Logger)
|
||||
}
|
||||
return sdk.NewContext(app.deliverState.ms, header, false, nil, log.NewNopLogger())
|
||||
return sdk.NewContext(app.deliverState.ms, header, false, nil, app.Logger)
|
||||
}
|
||||
|
||||
type state struct {
|
||||
|
@ -228,7 +228,7 @@ func (app *BaseApp) setCheckState(header abci.Header) {
|
|||
ms := app.cms.CacheMultiStore()
|
||||
app.checkState = &state{
|
||||
ms: ms,
|
||||
ctx: sdk.NewContext(ms, header, true, nil, log.NewNopLogger()),
|
||||
ctx: sdk.NewContext(ms, header, true, nil, app.Logger),
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -236,7 +236,7 @@ func (app *BaseApp) setDeliverState(header abci.Header) {
|
|||
ms := app.cms.CacheMultiStore()
|
||||
app.deliverState = &state{
|
||||
ms: ms,
|
||||
ctx: sdk.NewContext(ms, header, false, nil, log.NewNopLogger()),
|
||||
ctx: sdk.NewContext(ms, header, false, nil, app.Logger),
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,49 +0,0 @@
|
|||
package types
|
||||
|
||||
import (
|
||||
"github.com/tendermint/tmlibs/log"
|
||||
)
|
||||
|
||||
// MemLogger logs to memory
|
||||
type MemLogger interface {
|
||||
log.Logger
|
||||
Logs() []LogEntry
|
||||
}
|
||||
|
||||
// LogEntry is an entry in a log
|
||||
type LogEntry struct {
|
||||
Level string
|
||||
Message string
|
||||
Keyvals []interface{}
|
||||
}
|
||||
|
||||
type memLogger struct {
|
||||
entries *[]LogEntry
|
||||
}
|
||||
|
||||
func (l memLogger) Debug(msg string, keyvals ...interface{}) {
|
||||
*l.entries = append(*l.entries, LogEntry{"debug", msg, keyvals})
|
||||
}
|
||||
|
||||
func (l memLogger) Info(msg string, keyvals ...interface{}) {
|
||||
*l.entries = append(*l.entries, LogEntry{"info", msg, keyvals})
|
||||
}
|
||||
|
||||
func (l memLogger) Error(msg string, keyvals ...interface{}) {
|
||||
*l.entries = append(*l.entries, LogEntry{"error", msg, keyvals})
|
||||
}
|
||||
|
||||
func (l memLogger) With(keyvals ...interface{}) log.Logger {
|
||||
panic("not implemented")
|
||||
}
|
||||
|
||||
func (l memLogger) Logs() []LogEntry {
|
||||
return *l.entries
|
||||
}
|
||||
|
||||
func NewMemLogger() MemLogger {
|
||||
entries := make([]LogEntry, 0)
|
||||
return &memLogger{
|
||||
entries: &entries,
|
||||
}
|
||||
}
|
|
@ -1,17 +0,0 @@
|
|||
package types
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestMemLogger(t *testing.T) {
|
||||
logger := NewMemLogger()
|
||||
logger.Info("msg")
|
||||
require.Equal(t, logger.Logs(), []LogEntry{LogEntry{"info", "msg", nil}})
|
||||
logger.Debug("msg2")
|
||||
require.Equal(t, logger.Logs(), []LogEntry{LogEntry{"info", "msg", nil}, LogEntry{"debug", "msg2", nil}})
|
||||
logger.Error("msg3", 2)
|
||||
require.Equal(t, logger.Logs(), []LogEntry{LogEntry{"info", "msg", nil}, LogEntry{"debug", "msg2", nil}, LogEntry{"error", "msg3", []interface{}{2}}})
|
||||
}
|
Loading…
Reference in New Issue