diff --git a/server/api/server.go b/server/api/server.go index d48ef7a1a1..6bceed5721 100644 --- a/server/api/server.go +++ b/server/api/server.go @@ -149,9 +149,9 @@ func (s *Server) Start(ctx context.Context, cfg config.Config) error { if enableUnsafeCORS { allowAllCORS := handlers.CORS(handlers.AllowedHeaders([]string{"Content-Type"})) - errCh <- tmrpcserver.Serve(s.listener, allowAllCORS(s.Router), servercmtlog.CometZeroLogWrapper{Logger: s.logger}, cmtCfg) + errCh <- tmrpcserver.Serve(s.listener, allowAllCORS(s.Router), servercmtlog.CometLoggerWrapper{Logger: s.logger}, cmtCfg) } else { - errCh <- tmrpcserver.Serve(s.listener, s.Router, servercmtlog.CometZeroLogWrapper{Logger: s.logger}, cmtCfg) + errCh <- tmrpcserver.Serve(s.listener, s.Router, servercmtlog.CometLoggerWrapper{Logger: s.logger}, cmtCfg) } }(cfg.API.EnableUnsafeCORS) diff --git a/server/log/cmt_logger.go b/server/log/cmt_logger.go index 2bec70900d..9780c11ee5 100644 --- a/server/log/cmt_logger.go +++ b/server/log/cmt_logger.go @@ -5,18 +5,18 @@ import ( cmtlog "github.com/cometbft/cometbft/libs/log" ) -var _ cmtlog.Logger = (*CometZeroLogWrapper)(nil) +var _ cmtlog.Logger = (*CometLoggerWrapper)(nil) -// CometZeroLogWrapper provides a wrapper around a zerolog.Logger instance. +// CometLoggerWrapper provides a wrapper around a cosmossdk.io/log instance. // It implements CometBFT's Logger interface. -type CometZeroLogWrapper struct { +type CometLoggerWrapper struct { log.Logger } // With returns a new wrapped logger with additional context provided by a set // of key/value tuples. The number of tuples must be even and the key of the // tuple must be a string. -func (cmt CometZeroLogWrapper) With(keyVals ...interface{}) cmtlog.Logger { +func (cmt CometLoggerWrapper) With(keyVals ...interface{}) cmtlog.Logger { logger := cmt.Logger.With(keyVals...) - return CometZeroLogWrapper{logger} + return CometLoggerWrapper{logger} } diff --git a/server/start.go b/server/start.go index d7301f76d6..882ec02b10 100644 --- a/server/start.go +++ b/server/start.go @@ -234,7 +234,7 @@ func startStandAlone(svrCtx *Context, appCreator types.AppCreator) error { return fmt.Errorf("error creating listener: %v", err) } - svr.SetLogger(servercmtlog.CometZeroLogWrapper{Logger: svrCtx.Logger.With("module", "abci-server")}) + svr.SetLogger(servercmtlog.CometLoggerWrapper{Logger: svrCtx.Logger.With("module", "abci-server")}) ctx, cancelFn := context.WithCancel(context.Background()) g, ctx := errgroup.WithContext(ctx) @@ -329,7 +329,7 @@ func startInProcess(svrCtx *Context, clientCtx client.Context, appCreator types. genDocProvider, node.DefaultDBProvider, node.DefaultMetricsProvider(cfg.Instrumentation), - servercmtlog.CometZeroLogWrapper{Logger: svrCtx.Logger}, + servercmtlog.CometLoggerWrapper{Logger: svrCtx.Logger}, ) if err != nil { return err diff --git a/testutil/network/util.go b/testutil/network/util.go index 7c5cdc8007..aa1099bd10 100644 --- a/testutil/network/util.go +++ b/testutil/network/util.go @@ -58,7 +58,7 @@ func startInProcess(cfg Config, val *Validator) error { appGenesisProvider, node.DefaultDBProvider, node.DefaultMetricsProvider(cmtCfg.Instrumentation), - servercmtlog.CometZeroLogWrapper{Logger: logger.With("module", val.Moniker)}, + servercmtlog.CometLoggerWrapper{Logger: logger.With("module", val.Moniker)}, ) if err != nil { return err diff --git a/testutil/testnet/cometstarter.go b/testutil/testnet/cometstarter.go index 6693247f9a..c11fbeaf57 100644 --- a/testutil/testnet/cometstarter.go +++ b/testutil/testnet/cometstarter.go @@ -167,7 +167,7 @@ func (s *CometStarter) Start() (n *node.Node, err error) { appGenesisProvider, node.DefaultDBProvider, node.DefaultMetricsProvider(s.cfg.Instrumentation), - servercmtlog.CometZeroLogWrapper{Logger: s.logger}, + servercmtlog.CometLoggerWrapper{Logger: s.logger}, ) if err != nil { return nil, fmt.Errorf("failed to create comet node: %w", err) diff --git a/x/genutil/client/cli/init_test.go b/x/genutil/client/cli/init_test.go index a53e5037c1..c27ae1d195 100644 --- a/x/genutil/client/cli/init_test.go +++ b/x/genutil/client/cli/init_test.go @@ -218,7 +218,7 @@ func TestStartStandAlone(t *testing.T) { svr, err := abci_server.NewServer(svrAddr, "socket", app) require.NoError(t, err, "error creating listener") - svr.SetLogger(servercmtlog.CometZeroLogWrapper{Logger: logger.With("module", "abci-server")}) + svr.SetLogger(servercmtlog.CometLoggerWrapper{Logger: logger.With("module", "abci-server")}) err = svr.Start() require.NoError(t, err)