forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 02:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix test by closing logger file

Browse source 
Was expecting lumberjack.Rotate() to close the file
This commit is contained in:
Chris Ziogas 2024-03-29 22:03:34 +02:00
parent cba97ef430
commit 4708a19319
No known key found for this signature in database
GPG key ID: 2329CF479E36E2DA
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
eth/tracers/internal/tracetest/supply_test.go
View file

@ -528,10 +528,8 @@ func testSupplyTracer(t *testing.T, genesis *core.Genesis, gen func(*core.BlockG
engine = beacon.New(ethash.NewFaker()) engine = beacon.New(ethash.NewFaker())
) )
tmpDir := t.TempDir() traceOutputPath := filepath.ToSlash(t.TempDir())
traceOutputPath := filepath.ToSlash(tmpDir)
traceOutputFilename := path.Join(traceOutputPath, "supply.jsonl") traceOutputFilename := path.Join(traceOutputPath, "supply.jsonl")
t.Cleanup(func() { os.RemoveAll(tmpDir) })
// Load supply tracer // Load supply tracer
tracer, err := tracers.LiveDirectory.New("supply", json.RawMessage(fmt.Sprintf(`{"path":"%s"}`, traceOutputPath))) tracer, err := tracers.LiveDirectory.New("supply", json.RawMessage(fmt.Sprintf(`{"path":"%s"}`, traceOutputPath)))
@ -555,7 +553,6 @@ func testSupplyTracer(t *testing.T, genesis *core.Genesis, gen func(*core.BlockG
} }
// Check and compare the results // Check and compare the results
// TODO: replace file to pass results
file, err := os.OpenFile(traceOutputFilename, os.O_RDONLY, 0666) file, err := os.OpenFile(traceOutputFilename, os.O_RDONLY, 0666)
if err != nil { if err != nil {
return nil, chain, fmt.Errorf("failed to open output file: %v", err) return nil, chain, fmt.Errorf("failed to open output file: %v", err)

7
eth/tracers/live/supply.go
View file

@ -67,15 +67,16 @@ func newSupply(cfg json.RawMessage) (*tracing.Hooks, error) {
} }
// Store traces in a rotating file // Store traces in a rotating file
loggerOutput := &lumberjack.Logger{ loggerOutputFile := &lumberjack.Logger{
Filename: filepath.Join(config.Path, "supply.jsonl"), Filename: filepath.Join(config.Path, "supply.jsonl"),
} }
defer loggerOutputFile.Close()
if config.MaxSize > 0 { if config.MaxSize > 0 {
loggerOutput.MaxSize = config.MaxSize loggerOutputFile.MaxSize = config.MaxSize
} }
logger := log.New(loggerOutput, "", 0) logger := log.New(loggerOutputFile, "", 0)
supplyInfo := newSupplyInfo() supplyInfo := newSupplyInfo()