fix(server/v2): use only one logger for app and server (#22241)

This commit is contained in:
Julien Robert
2024-10-14 06:05:47 +00:00
committed by GitHub
parent 65ed5eb800
commit 1f941bbec7
7 changed files with 51 additions and 40 deletions
+1 -7
View File
@@ -55,11 +55,6 @@ func initRootCmd[T transaction.Tx](
NewTestnetCmd(moduleManager),
)
logger, err := serverv2.NewLogger(viper.New(), rootCmd.OutOrStdout())
if err != nil {
panic(fmt.Sprintf("failed to create logger: %v", err))
}
// add keybase, auxiliary RPC, query, genesis, and tx child commands
rootCmd.AddCommand(
genesisCommand(moduleManager),
@@ -70,10 +65,9 @@ func initRootCmd[T transaction.Tx](
)
// wire server commands
if err = serverv2.AddCommands(
if err := serverv2.AddCommands(
rootCmd,
newApp,
logger,
initServerConfig(),
cometbft.New(
&genericTxDecoder[T]{txConfig},
+1 -1
View File
@@ -79,7 +79,7 @@ func initCometConfig() cometbft.CfgOption {
cfg := cmtcfg.DefaultConfig()
// display only warn logs by default except for p2p and state
cfg.LogLevel = "*:warn,p2p:info,state:info"
cfg.LogLevel = "*:warn,server:info,p2p:info,state:info"
// increase block timeout
cfg.Consensus.TimeoutCommit = 5 * time.Second
// overwrite default pprof listen address
+1 -2
View File
@@ -15,7 +15,6 @@ import (
"github.com/spf13/pflag"
"cosmossdk.io/core/transaction"
"cosmossdk.io/log"
"cosmossdk.io/math"
"cosmossdk.io/math/unsafe"
runtimev2 "cosmossdk.io/runtime/v2"
@@ -344,7 +343,7 @@ func initTestnetFiles[T transaction.Tx](
)
storeServer := store.New[T]()
grpcServer := grpc.New[T](grpc.OverwriteDefaultConfig(grpcConfig))
server := serverv2.NewServer[T](log.NewNopLogger(), serverCfg, cometServer, grpcServer, storeServer)
server := serverv2.NewServer[T](serverCfg, cometServer, grpcServer, storeServer)
err = server.WriteConfig(filepath.Join(nodeDir, "config"))
if err != nil {
return err