chore: rename comet logger wrapper (#15983)

This commit is contained in:
Julien Robert 2023-04-28 16:36:09 +02:00 committed by GitHub
parent 1cca9c5f5f
commit 16e940df55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 12 deletions

View File

@ -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)

View File

@ -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}
}

View File

@ -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

View File

@ -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

View File

@ -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)

View File

@ -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)