From 4708a193192b1a0577e1834c327c8a8738d457e3 Mon Sep 17 00:00:00 2001 From: Chris Ziogas Date: Fri, 29 Mar 2024 22:03:34 +0200 Subject: [PATCH] fix test by closing logger file Was expecting lumberjack.Rotate() to close the file --- eth/tracers/internal/tracetest/supply_test.go | 5 +---- eth/tracers/live/supply.go | 7 ++++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/eth/tracers/internal/tracetest/supply_test.go b/eth/tracers/internal/tracetest/supply_test.go index 46e55f268d..9942c166c0 100644 --- a/eth/tracers/internal/tracetest/supply_test.go +++ b/eth/tracers/internal/tracetest/supply_test.go @@ -528,10 +528,8 @@ func testSupplyTracer(t *testing.T, genesis *core.Genesis, gen func(*core.BlockG engine = beacon.New(ethash.NewFaker()) ) - tmpDir := t.TempDir() - traceOutputPath := filepath.ToSlash(tmpDir) + traceOutputPath := filepath.ToSlash(t.TempDir()) traceOutputFilename := path.Join(traceOutputPath, "supply.jsonl") - t.Cleanup(func() { os.RemoveAll(tmpDir) }) // Load supply tracer 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 - // TODO: replace file to pass results file, err := os.OpenFile(traceOutputFilename, os.O_RDONLY, 0666) if err != nil { return nil, chain, fmt.Errorf("failed to open output file: %v", err) diff --git a/eth/tracers/live/supply.go b/eth/tracers/live/supply.go index f5b860f9c7..f35bd1d2be 100644 --- a/eth/tracers/live/supply.go +++ b/eth/tracers/live/supply.go @@ -67,15 +67,16 @@ func newSupply(cfg json.RawMessage) (*tracing.Hooks, error) { } // Store traces in a rotating file - loggerOutput := &lumberjack.Logger{ + loggerOutputFile := &lumberjack.Logger{ Filename: filepath.Join(config.Path, "supply.jsonl"), } + defer loggerOutputFile.Close() if config.MaxSize > 0 { - loggerOutput.MaxSize = config.MaxSize + loggerOutputFile.MaxSize = config.MaxSize } - logger := log.New(loggerOutput, "", 0) + logger := log.New(loggerOutputFile, "", 0) supplyInfo := newSupplyInfo()