Skip to content

op-batcher: Shutdown pprof and metrics after main loop returns #5345

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
OptimismBot merged 2 commits into from
Apr 5, 2023
Merged

op-batcher: Shutdown pprof and metrics after main loop returns #5345

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5712cee
op-batcher: Shutdown pprof and metrics after main loop returns
sebastianst Apr 4, 2023
c301829
Merge branch 'develop' into batcher-late-ctx-cancel
mergify[bot] Apr 5, 2023
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
8 changes: 5 additions & 3 deletions op-batcher/batcher/batch_submitter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,10 @@ func Main(version string, cliCtx *cli.Context) error {
return err
}
}
defer batchSubmitter.StopIfRunning(context.Background())

ctx, cancel := context.WithCancel(context.Background())
defer cancel() // Stop pprof and metrics only after main loop returns
defer batchSubmitter.StopIfRunning(context.Background())

pprofConfig := cfg.PprofConfig
if pprofConfig.Enabled {
Expand Down Expand Up @@ -106,7 +107,8 @@ func Main(version string, cliCtx *cli.Context) error {
syscall.SIGQUIT,
}...)
<-interruptChannel
cancel()
_ = server.Stop()
if err := server.Stop(); err != nil {
l.Error("Error shutting down http server: %w", err)
}
return nil
}