feat!: use cosmossdk.io/log logger (#15011)

This commit is contained in:
Julien Robert
2023-02-27 21:36:22 +00:00
committed by GitHub
parent 35d1e7a90a
commit 5d559dd265
101 changed files with 510 additions and 403 deletions
@@ -1,5 +1,5 @@
// Code generated by MockGen. DO NOT EDIT.
// Source: github.com/cometbft/cometbft/libs/log (interfaces: Logger)
// Source: cosmossdk.io/log (interfaces: Logger)
// Package mock is a generated GoMock package.
package mock
@@ -7,7 +7,7 @@ package mock
import (
reflect "reflect"
log "github.com/cometbft/cometbft/libs/log"
log "cosmossdk.io/log"
gomock "github.com/golang/mock/gomock"
)
@@ -68,6 +68,20 @@ func (mr *MockLoggerMockRecorder) Error(arg0 interface{}, arg1 ...interface{}) *
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockLogger)(nil).Error), varargs...)
}
// Impl mocks base method.
func (m *MockLogger) Impl() interface{} {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Impl")
ret0, _ := ret[0].(interface{})
return ret0
}
// Impl indicates an expected call of Impl.
func (mr *MockLoggerMockRecorder) Impl() *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Impl", reflect.TypeOf((*MockLogger)(nil).Impl))
}
// Info mocks base method.
func (m *MockLogger) Info(arg0 string, arg1 ...interface{}) {
m.ctrl.T.Helper()
+3 -4
View File
@@ -20,7 +20,6 @@ import (
sdkmath "cosmossdk.io/math"
"cosmossdk.io/math/unsafe"
pruningtypes "cosmossdk.io/store/pruning/types"
cmtlog "github.com/cometbft/cometbft/libs/log"
"github.com/cometbft/cometbft/node"
cmtclient "github.com/cometbft/cometbft/rpc/client"
dbm "github.com/cosmos/cosmos-db"
@@ -119,7 +118,7 @@ type Config struct {
StakingTokens sdkmath.Int // the amount of tokens each validator has available to stake
BondedTokens sdkmath.Int // the amount of tokens each validator stakes
PruningStrategy string // the pruning strategy each validator will have
EnableTMLogging bool // enable CometBFT logging to STDOUT
EnableLogging bool // enable logging to STDOUT
CleanupDir bool // remove base temporary directory during cleanup
SigningAlgo string // signing algorithm for keys
KeyringOptions []keyring.Option // keyring configuration options
@@ -406,8 +405,8 @@ func New(l Logger, baseDir string, cfg Config) (*Network, error) {
}
logger := log.NewNopLogger()
if cfg.EnableTMLogging {
logger = cmtlog.NewTMLogger(cmtlog.NewSyncWriter(os.Stdout))
if cfg.EnableLogging {
logger = log.NewLogger()
}
ctx.Logger = logger
+2 -1
View File
@@ -19,6 +19,7 @@ import (
"github.com/cosmos/cosmos-sdk/server/api"
servergrpc "github.com/cosmos/cosmos-sdk/server/grpc"
servercmtlog "github.com/cosmos/cosmos-sdk/server/log"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
"github.com/cosmos/cosmos-sdk/x/genutil"
@@ -57,7 +58,7 @@ func startInProcess(cfg Config, val *Validator) error {
appGenesisProvider,
node.DefaultDBProvider,
node.DefaultMetricsProvider(cmtCfg.Instrumentation),
logger.With("module", val.Moniker),
servercmtlog.CometZeroLogWrapper{Logger: logger.With("module", val.Moniker)},
)
if err != nil {
return err
+1 -1
View File
@@ -9,11 +9,11 @@ import (
sdkmath "cosmossdk.io/math"
abci "github.com/cometbft/cometbft/abci/types"
cmtjson "github.com/cometbft/cometbft/libs/json"
"github.com/cometbft/cometbft/libs/log"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
cmttypes "github.com/cometbft/cometbft/types"
dbm "github.com/cosmos/cosmos-db"
"cosmossdk.io/log"
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/cosmos/cosmos-sdk/codec"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
+2 -2
View File
@@ -6,9 +6,9 @@ import (
"fmt"
"os"
"github.com/cometbft/cometbft/libs/log"
dbm "github.com/cosmos/cosmos-db"
"cosmossdk.io/log"
storetypes "cosmossdk.io/store/types"
"github.com/cosmos/cosmos-sdk/codec"
@@ -29,7 +29,7 @@ func SetupSimulation(config simtypes.Config, dirPrefix, dbName string, verbose,
var logger log.Logger
if verbose {
logger = log.TestingLogger()
logger = log.NewLogger()
} else {
logger = log.NewNopLogger()
}