Skip to content

Commit db43896

Browse files
gzliudangzliudan
committed
all: replace log15 with slog (ethereum#28187)
1 parent a0f2e81 commit db43896

34 files changed

+999
-1711
lines changed

‎cmd/XDC/config.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ import (
3333
"github.com/XinFinOrg/XDPoSChain/cmd/utils"
3434
"github.com/XinFinOrg/XDPoSChain/common"
3535
"github.com/XinFinOrg/XDPoSChain/eth/ethconfig"
36-
"github.com/XinFinOrg/XDPoSChain/internal/debug"
37-
"github.com/XinFinOrg/XDPoSChain/log"
3836
"github.com/XinFinOrg/XDPoSChain/node"
3937
"github.com/XinFinOrg/XDPoSChain/params"
4038
"github.com/naoina/toml"
@@ -143,9 +141,9 @@ func makeConfigNode(ctx *cli.Context) (*node.Node, XDCConfig) {
143141
if ctx.GlobalIsSet(utils.StakingEnabledFlag.Name) {
144142
cfg.StakeEnable = ctx.GlobalBool(utils.StakingEnabledFlag.Name)
145143
}
146-
if !ctx.GlobalIsSet(debug.VerbosityFlag.Name) {
147-
debug.Glogger.Verbosity(log.Lvl(cfg.Verbosity))
148-
}
144+
// if !ctx.GlobalIsSet(debug.VerbosityFlag.Name) {
145+
// debug.Verbosity(log.Lvl(cfg.Verbosity))
146+
// }
149147

150148
if !ctx.GlobalIsSet(utils.NATFlag.Name) && cfg.NAT != "" {
151149
ctx.Set(utils.NATFlag.Name, cfg.NAT)

‎cmd/XDC/main.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ var (
136136
utils.GpoIgnoreGasPriceFlag,
137137
//utils.ExtraDataFlag,
138138
configFileFlag,
139+
utils.LogDebugFlag,
140+
utils.LogBacktraceAtFlag,
139141
utils.AnnounceTxsFlag,
140142
utils.StoreRewardFlag,
141143
utils.RollbackFlag,

‎cmd/bootnode/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ func main() {
5151
)
5252
flag.Parse()
5353

54-
glogger := log.NewGlogHandler(log.StreamHandler(os.Stderr, log.TerminalFormat(false)))
55-
glogger.Verbosity(log.Lvl(*verbosity))
54+
glogger := log.NewGlogHandler(log.NewTerminalHandler(os.Stderr, false))
55+
glogger.Verbosity(log.FromLegacyLevel(*verbosity))
5656
glogger.Vmodule(*vmodule)
57-
log.Root().SetHandler(glogger)
57+
log.SetDefault(log.NewLogger(glogger))
5858

5959
natm, err := nat.Parse(*natdesc)
6060
if err != nil {

‎cmd/evm/main.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,14 @@ var (
110110
Name: "nostack",
111111
Usage: "disable stack output",
112112
}
113+
DisableStorageFlag = &cli.BoolFlag{
114+
Name: "nostorage",
115+
Usage: "disable storage output",
116+
}
117+
DisableReturnDataFlag = &cli.BoolFlag{
118+
Name: "noreturndata",
119+
Usage: "enable return data output",
120+
}
113121
)
114122

115123
func init() {

‎cmd/evm/runner.go

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,18 @@ import (
2222
"fmt"
2323
"io"
2424
"os"
25+
goruntime "runtime"
2526
"runtime/pprof"
2627
"time"
2728

28-
"github.com/XinFinOrg/XDPoSChain/core/rawdb"
29-
30-
goruntime "runtime"
31-
3229
"github.com/XinFinOrg/XDPoSChain/cmd/evm/internal/compiler"
3330
"github.com/XinFinOrg/XDPoSChain/cmd/utils"
3431
"github.com/XinFinOrg/XDPoSChain/common"
3532
"github.com/XinFinOrg/XDPoSChain/core"
33+
"github.com/XinFinOrg/XDPoSChain/core/rawdb"
3634
"github.com/XinFinOrg/XDPoSChain/core/state"
3735
"github.com/XinFinOrg/XDPoSChain/core/vm"
3836
"github.com/XinFinOrg/XDPoSChain/core/vm/runtime"
39-
"github.com/XinFinOrg/XDPoSChain/log"
4037
"github.com/XinFinOrg/XDPoSChain/params"
4138
cli "gopkg.in/urfave/cli.v1"
4239
)
@@ -71,12 +68,12 @@ func readGenesis(genesisPath string) *core.Genesis {
7168
}
7269

7370
func runCmd(ctx *cli.Context) error {
74-
glogger := log.NewGlogHandler(log.StreamHandler(os.Stderr, log.TerminalFormat(false)))
75-
glogger.Verbosity(log.Lvl(ctx.GlobalInt(VerbosityFlag.Name)))
76-
log.Root().SetHandler(glogger)
7771
logconfig := &vm.LogConfig{
78-
EnableMemory: !ctx.GlobalBool(DisableMemoryFlag.Name),
79-
DisableStack: ctx.GlobalBool(DisableStackFlag.Name),
72+
EnableMemory: !ctx.GlobalBool(DisableMemoryFlag.Name),
73+
DisableStack: ctx.GlobalBool(DisableStackFlag.Name),
74+
DisableStorage: ctx.Bool(DisableStorageFlag.Name),
75+
EnableReturnData: !ctx.Bool(DisableReturnDataFlag.Name),
76+
Debug: ctx.Bool(DebugFlag.Name),
8077
}
8178

8279
var (
@@ -95,6 +92,7 @@ func runCmd(ctx *cli.Context) error {
9592
} else {
9693
debugLogger = vm.NewStructLogger(logconfig)
9794
}
95+
9896
if ctx.GlobalString(GenesisFlag.Name) != "" {
9997
gen := readGenesis(ctx.GlobalString(GenesisFlag.Name))
10098
db := rawdb.NewMemoryDatabase()

‎cmd/evm/staterunner.go

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ import (
2424

2525
"github.com/XinFinOrg/XDPoSChain/core/state"
2626
"github.com/XinFinOrg/XDPoSChain/core/vm"
27-
"github.com/XinFinOrg/XDPoSChain/log"
2827
"github.com/XinFinOrg/XDPoSChain/tests"
29-
3028
cli "gopkg.in/urfave/cli.v1"
3129
)
3230

@@ -49,16 +47,15 @@ func stateTestCmd(ctx *cli.Context) error {
4947
if len(ctx.Args().First()) == 0 {
5048
return errors.New("path-to-test argument required")
5149
}
52-
// Configure the go-ethereum logger
53-
glogger := log.NewGlogHandler(log.StreamHandler(os.Stderr, log.TerminalFormat(false)))
54-
glogger.Verbosity(log.Lvl(ctx.GlobalInt(VerbosityFlag.Name)))
55-
log.Root().SetHandler(glogger)
5650

5751
// Configure the EVM logger
5852
config := &vm.LogConfig{
59-
EnableMemory: !ctx.GlobalBool(DisableMemoryFlag.Name),
60-
DisableStack: ctx.GlobalBool(DisableStackFlag.Name),
53+
EnableMemory: !ctx.GlobalBool(DisableMemoryFlag.Name),
54+
DisableStack: ctx.GlobalBool(DisableStackFlag.Name),
55+
DisableStorage: ctx.Bool(DisableStorageFlag.Name),
56+
EnableReturnData: !ctx.Bool(DisableReturnDataFlag.Name),
6157
}
58+
6259
var (
6360
tracer vm.EVMLogger
6461
debugger *vm.StructLogger

‎cmd/faucet/faucet.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ var (
9494
func main() {
9595
// Parse the flags and set up the logger to print everything requested
9696
flag.Parse()
97-
log.Root().SetHandler(log.LvlFilterHandler(log.Lvl(*logFlag), log.StreamHandler(os.Stderr, log.TerminalFormat(true))))
97+
log.SetDefault(log.NewLogger(log.NewTerminalHandlerWithLevel(os.Stderr, log.FromLegacyLevel(*logFlag), true)))
9898

9999
// Construct the payout tiers
100100
amounts := make([]string, *tiersFlag)

‎cmd/puppeth/puppeth.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func main() {
4545
}
4646
app.Action = func(c *cli.Context) error {
4747
// Set up the logger to print everything and the random generator
48-
log.Root().SetHandler(log.LvlFilterHandler(log.Lvl(c.Int("loglevel")), log.StreamHandler(os.Stdout, log.TerminalFormat(true))))
48+
log.SetDefault(log.NewLogger(log.NewTerminalHandlerWithLevel(os.Stdout, log.FromLegacyLevel(c.Int("loglevel")), true)))
4949
rand.Seed(time.Now().UnixNano())
5050

5151
network := c.String("network")

‎cmd/utils/flags.go

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -618,6 +618,16 @@ var (
618618
Name: "slave",
619619
Usage: "Enable slave mode",
620620
}
621+
// Deprecated November 2023
622+
LogBacktraceAtFlag = &cli.StringFlag{
623+
Name: "log.backtrace",
624+
Usage: "Request a stack trace at a specific logging statement (deprecated)",
625+
Value: "",
626+
}
627+
LogDebugFlag = &cli.BoolFlag{
628+
Name: "log.debug",
629+
Usage: "Prepends log messages with call-site location (deprecated)",
630+
}
621631
)
622632

623633
// MakeDataDir retrieves the currently requested data directory, terminating
@@ -1015,6 +1025,13 @@ func SetNodeConfig(ctx *cli.Context, cfg *node.Config) {
10151025
if ctx.GlobalIsSet(AnnounceTxsFlag.Name) {
10161026
cfg.AnnounceTxs = ctx.GlobalBool(AnnounceTxsFlag.Name)
10171027
}
1028+
// deprecation notice for log debug flags (TODO: find a more appropriate place to put these?)
1029+
if ctx.IsSet(LogBacktraceAtFlag.Name) {
1030+
log.Warn("log.backtrace flag is deprecated")
1031+
}
1032+
if ctx.IsSet(LogDebugFlag.Name) {
1033+
log.Warn("log.debug flag is deprecated")
1034+
}
10181035
}
10191036

10201037
func setGPO(ctx *cli.Context, cfg *gasprice.Config, light bool) {

‎contracts/tests/Inherited_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ var (
1919
)
2020

2121
func TestPriceFeed(t *testing.T) {
22-
glogger := log.NewGlogHandler(log.StreamHandler(os.Stderr, log.TerminalFormat(false)))
23-
glogger.Verbosity(log.LvlTrace)
24-
log.Root().SetHandler(glogger)
22+
glogger := log.NewGlogHandler(log.NewTerminalHandler(os.Stderr, false))
23+
glogger.Verbosity(log.LevelTrace)
24+
log.SetDefault(log.NewLogger(glogger))
25+
2526
common.TIPXDCXCancellationFee = big.NewInt(0)
2627
// init genesis
2728
contractBackend := backends.NewSimulatedBackend(core.GenesisAlloc{

‎eth/protocol_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
)
3333

3434
func init() {
35-
// log.Root().SetHandler(log.LvlFilterHandler(log.LvlTrace, log.StreamHandler(os.Stderr, log.TerminalFormat(false))))
35+
// log.SetDefault(log.NewLogger(log.NewTerminalHandlerWithLevel(os.Stderr, log.LevelTrace, false)))
3636
}
3737

3838
var testAccount, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")

‎go.mod

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ module github.com/XinFinOrg/XDPoSChain
33
go 1.21
44

55
require (
6-
bazil.org/fuse v0.0.0-20180421153158-65cc252bf669
76
github.com/VictoriaMetrics/fastcache v1.12.2
87
github.com/aristanetworks/goarista v0.0.0-20231019142648-8c6f0862ab98
98
github.com/btcsuite/btcd v0.0.0-20171128150713-2e60448ffcc6
@@ -12,9 +11,7 @@ require (
1211
github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf
1312
github.com/edsrzf/mmap-go v1.0.0
1413
github.com/fatih/color v1.13.0
15-
github.com/gizak/termui v2.2.0+incompatible
1614
github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8
17-
github.com/go-stack/stack v1.8.1
1815
github.com/golang/protobuf v1.5.3
1916
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb
2017
github.com/gorilla/websocket v1.4.2
@@ -38,7 +35,6 @@ require (
3835
github.com/stretchr/testify v1.8.4
3936
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
4037
golang.org/x/crypto v0.15.0
41-
golang.org/x/net v0.17.0
4238
golang.org/x/sync v0.4.0
4339
golang.org/x/sys v0.24.0
4440
golang.org/x/tools v0.14.0
@@ -48,37 +44,32 @@ require (
4844
gopkg.in/urfave/cli.v1 v1.20.0
4945
)
5046

51-
require github.com/deckarep/golang-set v1.8.0
47+
require (
48+
github.com/deckarep/golang-set v1.8.0
49+
github.com/dop251/goja v0.0.0-20200106141417-aaec0e7bde29
50+
github.com/kylelemons/godebug v1.1.0
51+
github.com/mattn/go-isatty v0.0.17
52+
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible
53+
golang.org/x/exp v0.0.0-20231006140011-7918f672742d
54+
gopkg.in/natefinch/lumberjack.v2 v2.2.1
55+
)
5256

5357
require (
5458
github.com/StackExchange/wmi v1.2.1 // indirect
5559
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5660
github.com/dlclark/regexp2 v1.10.0 // indirect
57-
github.com/dop251/goja v0.0.0-20200106141417-aaec0e7bde29 // indirect
58-
github.com/elastic/gosigar v0.8.1-0.20180330100440-37f05ff46ffa // indirect
5961
github.com/go-ole/go-ole v1.2.5 // indirect
6062
github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
6163
github.com/google/go-cmp v0.6.0 // indirect
62-
github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect
6364
github.com/google/uuid v1.3.0 // indirect
6465
github.com/kr/pretty v0.3.1 // indirect
6566
github.com/kr/text v0.2.0 // indirect
66-
github.com/kylelemons/godebug v1.1.0 // indirect
67-
github.com/maruel/panicparse v0.0.0-20160720141634-ad661195ed0e // indirect
68-
github.com/maruel/ut v1.0.2 // indirect
69-
github.com/mattn/go-isatty v0.0.17 // indirect
7067
github.com/mattn/go-runewidth v0.0.13 // indirect
71-
github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect
7268
github.com/naoina/go-stringutil v0.1.0 // indirect
73-
github.com/nsf/termbox-go v0.0.0-20170211012700-3540b76b9c77 // indirect
7469
github.com/pmezard/go-difflib v1.0.0 // indirect
7570
github.com/rivo/uniseg v0.2.0 // indirect
7671
github.com/rogpeppe/go-internal v1.9.0 // indirect
77-
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
7872
github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3 // indirect
79-
github.com/tklauser/go-sysconf v0.3.12 // indirect
80-
github.com/tklauser/numcpus v0.6.1 // indirect
81-
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
8273
golang.org/x/mod v0.13.0 // indirect
8374
golang.org/x/term v0.14.0 // indirect
8475
golang.org/x/text v0.14.0 // indirect

0 commit comments

Comments
 (0)