mirror of
https://github.com/tendermint/tendermint.git
synced 2026-09-03 06:37:14 +00:00
logger: refactor Tendermint logger by using zerolog (#6534)
This commit is contained in:
+1
-2
@@ -5,7 +5,6 @@ import (
|
||||
"encoding/base64"
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strconv"
|
||||
|
||||
@@ -39,7 +38,7 @@ func NewApplication(cfg *Config) (*Application, error) {
|
||||
return nil, err
|
||||
}
|
||||
return &Application{
|
||||
logger: log.NewTMLogger(log.NewSyncWriter(os.Stdout)),
|
||||
logger: log.MustNewDefaultLogger(log.LogFormatPlain, log.LogLevelInfo, false),
|
||||
state: state,
|
||||
snapshots: snapshots,
|
||||
cfg: cfg,
|
||||
|
||||
+3
-10
@@ -17,7 +17,6 @@ import (
|
||||
"github.com/tendermint/tendermint/abci/server"
|
||||
"github.com/tendermint/tendermint/config"
|
||||
"github.com/tendermint/tendermint/crypto/ed25519"
|
||||
tmflags "github.com/tendermint/tendermint/libs/cli/flags"
|
||||
"github.com/tendermint/tendermint/libs/log"
|
||||
tmnet "github.com/tendermint/tendermint/libs/net"
|
||||
"github.com/tendermint/tendermint/light"
|
||||
@@ -34,7 +33,7 @@ import (
|
||||
e2e "github.com/tendermint/tendermint/test/e2e/pkg"
|
||||
)
|
||||
|
||||
var logger = log.NewTMLogger(log.NewSyncWriter(os.Stdout))
|
||||
var logger = log.MustNewDefaultLogger(log.LogFormatPlain, log.LogLevelInfo, false)
|
||||
|
||||
// main is the binary entrypoint.
|
||||
func main() {
|
||||
@@ -287,18 +286,12 @@ func setupNode() (*config.Config, log.Logger, error) {
|
||||
return nil, nil, fmt.Errorf("error in config file: %w", err)
|
||||
}
|
||||
|
||||
if tmcfg.LogFormat == config.LogFormatJSON {
|
||||
logger = log.NewTMJSONLogger(log.NewSyncWriter(os.Stdout))
|
||||
}
|
||||
|
||||
nodeLogger, err := tmflags.ParseLogLevel(tmcfg.LogLevel, logger, config.DefaultLogLevel)
|
||||
nodeLogger, err := log.NewDefaultLogger(tmcfg.LogFormat, tmcfg.LogLevel, false)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
nodeLogger = nodeLogger.With("module", "main")
|
||||
|
||||
return tmcfg, nodeLogger, nil
|
||||
return tmcfg, nodeLogger.With("module", "main"), nil
|
||||
}
|
||||
|
||||
// rpcEndpoints takes a list of persistent peers and splits them into a list of rpc endpoints
|
||||
|
||||
@@ -17,7 +17,7 @@ const (
|
||||
randomSeed int64 = 4827085738
|
||||
)
|
||||
|
||||
var logger = log.NewTMLogger(log.NewSyncWriter(os.Stdout))
|
||||
var logger = log.MustNewDefaultLogger(log.LogFormatPlain, log.LogLevelInfo, false)
|
||||
|
||||
func main() {
|
||||
NewCLI().Run()
|
||||
|
||||
@@ -13,7 +13,7 @@ import (
|
||||
)
|
||||
|
||||
var (
|
||||
logger = log.NewTMLogger(log.NewSyncWriter(os.Stdout))
|
||||
logger = log.MustNewDefaultLogger(log.LogFormatPlain, log.LogLevelInfo, false)
|
||||
)
|
||||
|
||||
func main() {
|
||||
|
||||
@@ -2,7 +2,6 @@ package pex
|
||||
|
||||
import (
|
||||
"net"
|
||||
"os"
|
||||
|
||||
"github.com/tendermint/tendermint/config"
|
||||
"github.com/tendermint/tendermint/crypto/ed25519"
|
||||
@@ -16,7 +15,7 @@ import (
|
||||
var (
|
||||
pexR *pex.Reactor
|
||||
peer p2p.Peer
|
||||
logger = log.NewTMLogger(log.NewSyncWriter(os.Stdout))
|
||||
logger = log.MustNewDefaultLogger(log.LogFormatPlain, log.LogLevelInfo, false)
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
||||
@@ -6,7 +6,6 @@ import (
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"os"
|
||||
|
||||
"github.com/tendermint/tendermint/libs/log"
|
||||
rs "github.com/tendermint/tendermint/rpc/jsonrpc/server"
|
||||
@@ -20,7 +19,7 @@ var mux *http.ServeMux
|
||||
|
||||
func init() {
|
||||
mux = http.NewServeMux()
|
||||
lgr := log.NewTMLogger(log.NewSyncWriter(os.Stdout))
|
||||
lgr := log.MustNewDefaultLogger(log.LogFormatPlain, log.LogLevelInfo, false)
|
||||
rs.RegisterRPCFuncs(mux, rpcFuncMap, lgr)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user