diff --git a/baseapp/abci_test.go b/baseapp/abci_test.go index 3de62e4fb0..e24af97065 100644 --- a/baseapp/abci_test.go +++ b/baseapp/abci_test.go @@ -78,7 +78,7 @@ func TestABCI_First_block_Height(t *testing.T) { func TestABCI_InitChain(t *testing.T) { name := t.Name() db := dbm.NewMemDB() - logger := log.NewNopLogger() + logger := log.NewTestLogger(t) app := baseapp.NewBaseApp(name, logger, db, nil, baseapp.SetChainID("test-chain-id")) capKey := storetypes.NewKVStoreKey("main") @@ -180,7 +180,7 @@ func TestABCI_InitChain(t *testing.T) { func TestABCI_InitChain_WithInitialHeight(t *testing.T) { name := t.Name() db := dbm.NewMemDB() - app := baseapp.NewBaseApp(name, log.NewNopLogger(), db, nil) + app := baseapp.NewBaseApp(name, log.NewTestLogger(t), db, nil) _, err := app.InitChain( &abci.RequestInitChain{ @@ -197,7 +197,7 @@ func TestABCI_InitChain_WithInitialHeight(t *testing.T) { func TestABCI_FinalizeBlock_WithInitialHeight(t *testing.T) { name := t.Name() db := dbm.NewMemDB() - app := baseapp.NewBaseApp(name, log.NewNopLogger(), db, nil) + app := baseapp.NewBaseApp(name, log.NewTestLogger(t), db, nil) _, err := app.InitChain( &abci.RequestInitChain{ @@ -219,7 +219,7 @@ func TestABCI_FinalizeBlock_WithInitialHeight(t *testing.T) { func TestABCI_FinalizeBlock_WithBeginAndEndBlocker(t *testing.T) { name := t.Name() db := dbm.NewMemDB() - app := baseapp.NewBaseApp(name, log.NewNopLogger(), db, nil) + app := baseapp.NewBaseApp(name, log.NewTestLogger(t), db, nil) app.SetBeginBlocker(func(ctx sdk.Context) (sdk.BeginBlock, error) { return sdk.BeginBlock{ @@ -286,7 +286,7 @@ func TestABCI_FinalizeBlock_WithBeginAndEndBlocker(t *testing.T) { func TestABCI_ExtendVote(t *testing.T) { name := t.Name() db := dbm.NewMemDB() - app := baseapp.NewBaseApp(name, log.NewNopLogger(), db, nil) + app := baseapp.NewBaseApp(name, log.NewTestLogger(t), db, nil) app.SetExtendVoteHandler(func(ctx sdk.Context, req *abci.RequestExtendVote) (*abci.ResponseExtendVote, error) { voteExt := "foo" + hex.EncodeToString(req.Hash) + strconv.FormatInt(req.Height, 10) @@ -369,7 +369,7 @@ func TestABCI_ExtendVote(t *testing.T) { func TestABCI_OnlyVerifyVoteExtension(t *testing.T) { name := t.Name() db := dbm.NewMemDB() - app := baseapp.NewBaseApp(name, log.NewNopLogger(), db, nil) + app := baseapp.NewBaseApp(name, log.NewTestLogger(t), db, nil) app.SetVerifyVoteExtensionHandler(func(ctx sdk.Context, req *abci.RequestVerifyVoteExtension) (*abci.ResponseVerifyVoteExtension, error) { // do some kind of verification here @@ -503,7 +503,7 @@ func TestABCI_P2PQuery(t *testing.T) { func TestBaseApp_PrepareCheckState(t *testing.T) { db := dbm.NewMemDB() name := t.Name() - logger := log.NewNopLogger() + logger := log.NewTestLogger(t) cp := &cmtproto.ConsensusParams{ Block: &cmtproto.BlockParams{ @@ -532,7 +532,7 @@ func TestBaseApp_PrepareCheckState(t *testing.T) { func TestBaseApp_Precommit(t *testing.T) { db := dbm.NewMemDB() name := t.Name() - logger := log.NewNopLogger() + logger := log.NewTestLogger(t) cp := &cmtproto.ConsensusParams{ Block: &cmtproto.BlockParams{ @@ -1238,7 +1238,7 @@ func TestABCI_Query(t *testing.T) { } func TestABCI_GetBlockRetentionHeight(t *testing.T) { - logger := log.NewNopLogger() + logger := log.NewTestLogger(t) db := dbm.NewMemDB() name := t.Name() @@ -1351,7 +1351,7 @@ func TestABCI_GetBlockRetentionHeight(t *testing.T) { func TestPrepareCheckStateCalledWithCheckState(t *testing.T) { t.Parallel() - logger := log.NewNopLogger() + logger := log.NewTestLogger(t) db := dbm.NewMemDB() name := t.Name() app := baseapp.NewBaseApp(name, logger, db, nil) @@ -1374,7 +1374,7 @@ func TestPrepareCheckStateCalledWithCheckState(t *testing.T) { func TestPrecommiterCalledWithDeliverState(t *testing.T) { t.Parallel() - logger := log.NewNopLogger() + logger := log.NewTestLogger(t) db := dbm.NewMemDB() name := t.Name() app := baseapp.NewBaseApp(name, logger, db, nil) @@ -2009,7 +2009,7 @@ func TestABCI_HaltChain(t *testing.T) { func TestBaseApp_PreFinalizeBlockHook(t *testing.T) { db := dbm.NewMemDB() name := t.Name() - logger := log.NewNopLogger() + logger := log.NewTestLogger(t) app := baseapp.NewBaseApp(name, logger, db, nil) _, err := app.InitChain(&abci.RequestInitChain{}) diff --git a/baseapp/baseapp_test.go b/baseapp/baseapp_test.go index 77c7c955e0..0fef6903b7 100644 --- a/baseapp/baseapp_test.go +++ b/baseapp/baseapp_test.go @@ -66,7 +66,7 @@ func NewBaseAppSuite(t *testing.T, opts ...func(*baseapp.BaseApp)) *BaseAppSuite txConfig := authtx.NewTxConfig(cdc, authtx.DefaultSignModes) db := dbm.NewMemDB() - app := baseapp.NewBaseApp(t.Name(), log.NewNopLogger(), db, txConfig.TxDecoder(), opts...) + app := baseapp.NewBaseApp(t.Name(), log.NewTestLogger(t), db, txConfig.TxDecoder(), opts...) require.Equal(t, t.Name(), app.Name()) app.SetInterfaceRegistry(cdc.InterfaceRegistry()) @@ -91,7 +91,7 @@ func getQueryBaseapp(t *testing.T) *baseapp.BaseApp { db := dbm.NewMemDB() name := t.Name() - app := baseapp.NewBaseApp(name, log.NewNopLogger(), db, nil) + app := baseapp.NewBaseApp(name, log.NewTestLogger(t), db, nil) _, err := app.FinalizeBlock(&abci.RequestFinalizeBlock{Height: 1}) require.NoError(t, err) @@ -192,7 +192,7 @@ func NewBaseAppSuiteWithSnapshots(t *testing.T, cfg SnapshotsConfig, opts ...fun } func TestLoadVersion(t *testing.T) { - logger := log.NewNopLogger() + logger := log.NewTestLogger(t) pruningOpt := baseapp.SetPruning(pruningtypes.NewPruningOptions(pruningtypes.PruningNothing)) db := dbm.NewMemDB() name := t.Name() @@ -323,7 +323,7 @@ func TestSetLoader(t *testing.T) { if tc.setLoader != nil { opts = append(opts, tc.setLoader) } - app := baseapp.NewBaseApp(t.Name(), log.NewNopLogger(), db, nil, opts...) + app := baseapp.NewBaseApp(t.Name(), log.NewTestLogger(t), db, nil, opts...) app.MountStores(storetypes.NewKVStoreKey(tc.loadStoreKey)) err := app.LoadLatestVersion() require.Nil(t, err) @@ -346,7 +346,7 @@ func TestVersionSetterGetter(t *testing.T) { pruningOpt := baseapp.SetPruning(pruningtypes.NewPruningOptions(pruningtypes.PruningDefault)) db := dbm.NewMemDB() name := t.Name() - app := baseapp.NewBaseApp(name, log.NewNopLogger(), db, nil, pruningOpt) + app := baseapp.NewBaseApp(name, log.NewTestLogger(t), db, nil, pruningOpt) require.Equal(t, "", app.Version()) res, err := app.Query(context.TODO(), &abci.RequestQuery{Path: "app/version"}) @@ -405,7 +405,7 @@ func TestOptionFunction(t *testing.T) { } db := dbm.NewMemDB() - bap := baseapp.NewBaseApp("starting name", log.NewNopLogger(), db, nil, testChangeNameHelper("new name")) + bap := baseapp.NewBaseApp("starting name", log.NewTestLogger(t), db, nil, testChangeNameHelper("new name")) require.Equal(t, bap.Name(), "new name", "BaseApp should have had name changed via option function") } @@ -597,7 +597,7 @@ func TestABCI_CreateQueryContext(t *testing.T) { db := dbm.NewMemDB() name := t.Name() - app := baseapp.NewBaseApp(name, log.NewNopLogger(), db, nil) + app := baseapp.NewBaseApp(name, log.NewTestLogger(t), db, nil) _, err := app.FinalizeBlock(&abci.RequestFinalizeBlock{Height: 1}) require.NoError(t, err) diff --git a/baseapp/grpcrouter_test.go b/baseapp/grpcrouter_test.go index 976708ba58..593125c692 100644 --- a/baseapp/grpcrouter_test.go +++ b/baseapp/grpcrouter_test.go @@ -59,7 +59,7 @@ func TestRegisterQueryServiceTwice(t *testing.T) { err := depinject.Inject( depinject.Configs( makeMinimalConfig(), - depinject.Supply(log.NewNopLogger()), + depinject.Supply(log.NewTestLogger(t)), ), &appBuilder) require.NoError(t, err) diff --git a/baseapp/msg_service_router_test.go b/baseapp/msg_service_router_test.go index a9b5cd1613..23acbe9940 100644 --- a/baseapp/msg_service_router_test.go +++ b/baseapp/msg_service_router_test.go @@ -30,7 +30,7 @@ func TestRegisterMsgService(t *testing.T) { err := depinject.Inject( depinject.Configs( makeMinimalConfig(), - depinject.Supply(log.NewNopLogger()), + depinject.Supply(log.NewTestLogger(t)), ), &appBuilder, ®istry) require.NoError(t, err) app := appBuilder.Build(dbm.NewMemDB(), nil) @@ -62,7 +62,7 @@ func TestRegisterMsgServiceTwice(t *testing.T) { err := depinject.Inject( depinject.Configs( makeMinimalConfig(), - depinject.Supply(log.NewNopLogger()), + depinject.Supply(log.NewTestLogger(t)), ), &appBuilder, ®istry) require.NoError(t, err) db := dbm.NewMemDB() diff --git a/log/CHANGELOG.md b/log/CHANGELOG.md index 9942c4e964..8faf08db32 100644 --- a/log/CHANGELOG.md +++ b/log/CHANGELOG.md @@ -22,6 +22,10 @@ Each entry must include the Github issue reference in the following format: ## [Unreleased] +## [v1.2.1](https://github.com/cosmos/cosmos-sdk/releases/tag/log/v1.2.1) - 2023-08-25 + +* [#17532](https://github.com/cosmos/cosmos-sdk/pull/17532) Proper marshalling of `fmt.Stringer` (follow-up of [#17205](https://github.com/cosmos/cosmos-sdk/pull/17205)). + ## [v1.2.0](https://github.com/cosmos/cosmos-sdk/releases/tag/log/v1.2.0) - 2023-07-31 * [#17194](https://github.com/cosmos/cosmos-sdk/pull/17194) Avoid repeating parse log level in `ParseLogLevel`. diff --git a/log/logger.go b/log/logger.go index 0d1dd60a5d..859212db27 100644 --- a/log/logger.go +++ b/log/logger.go @@ -19,7 +19,7 @@ func init() { case encoding.TextMarshaler: return json.Marshal(i) case fmt.Stringer: - return fmt.Appendf([]byte("\""), "%s%s", v.String(), "\""), nil + return json.Marshal(v.String()) default: return json.Marshal(i) } diff --git a/server/cmd/execute.go b/server/cmd/execute.go index 7a1a0c5ad1..874fc51cc1 100644 --- a/server/cmd/execute.go +++ b/server/cmd/execute.go @@ -25,7 +25,7 @@ func Execute(rootCmd *cobra.Command, envPrefix, defaultHome string) error { // https://github.com/spf13/cobra/pull/1118. ctx := CreateExecuteContext(context.Background()) - rootCmd.PersistentFlags().String(flags.FlagLogLevel, zerolog.InfoLevel.String(), "The logging level (trace|debug|info|warn|error|fatal|panic)") + rootCmd.PersistentFlags().String(flags.FlagLogLevel, zerolog.InfoLevel.String(), "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:,:')") // NOTE: The default logger is only checking for the "json" value, any other value will default to plain text. rootCmd.PersistentFlags().String(flags.FlagLogFormat, "plain", "The logging format (json|plain)")