Skip to content

Enable parsing log level for different modules #527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FletcherMan merged 1 commit into from
Sep 6, 2024
Merged

Enable parsing log level for different modules #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions node/core/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/scroll-tech/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/common/hexutil"
tmconfig "github.com/tendermint/tendermint/config"
tmflags "github.com/tendermint/tendermint/libs/cli/flags"
tmlog "github.com/tendermint/tendermint/libs/log"
"github.com/urfave/cli"
"gopkg.in/natefinch/lumberjack.v2"
Expand Down Expand Up @@ -80,11 +81,12 @@ func (c *Config) SetCliContext(ctx *cli.Context) error {
if ctx.GlobalIsSet(flags.LogLevel.Name) {
logLevel = ctx.GlobalString(flags.LogLevel.Name)
}
option, err := tmlog.AllowLevel(logLevel)

logger, err := tmflags.ParseLogLevel(logLevel, logger, "info")
if err != nil {
return err
}
logger = tmlog.NewFilter(logger, option)

c.Logger = logger

l2EthAddr := ctx.GlobalString(flags.L2EthAddr.Name)
Expand Down
11 changes: 1 addition & 10 deletions node/sequencer/tm_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@ package sequencer
import (
"context"
"fmt"
"os"
"path/filepath"

"github.com/spf13/viper"
tmtypes "github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/blssignatures"
"github.com/tendermint/tendermint/config"
tmflags "github.com/tendermint/tendermint/libs/cli/flags"
tmlog "github.com/tendermint/tendermint/libs/log"
tmos "github.com/tendermint/tendermint/libs/os"
tmnode "github.com/tendermint/tendermint/node"
Expand Down Expand Up @@ -54,14 +52,7 @@ func LoadTmConfig(ctx *cli.Context, home string) (*config.Config, error) {
}

func SetupNode(tmCfg *config.Config, privValidator types.PrivValidator, executor *node.Executor, logger tmlog.Logger) (*tmnode.Node, error) {
if tmCfg.LogFormat == config.LogFormatJSON {
logger = tmlog.NewTMJSONLogger(tmlog.NewSyncWriter(os.Stdout))
}
nodeLogger, err := tmflags.ParseLogLevel(tmCfg.LogLevel, logger, config.DefaultLogLevel)
if err != nil {
return nil, err
}
nodeLogger = nodeLogger.With("module", "main")
nodeLogger := logger.With("module", "main")

nodeKey, err := p2p.LoadOrGenNodeKey(tmCfg.NodeKeyFile())
if err != nil {
Expand Down