Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- [\#645](https://github.com/cosmos/evm/pull/645) Align precise bank keeper for correct decimal conversion in evmd.
- [\#656](https://github.com/cosmos/evm/pull/656) Fix race condition in concurrent usage of mempool StateAt and NotifyNewBlock methods.
- [\#658](https://github.com/cosmos/evm/pull/658) Fix race condition between legacypool's RemoveTx and runReorg.
- [\#687](https://github.com/cosmos/evm/pull/687) Avoid blocking node shutdown when evm indexer is enabled, log startup failures instead of using errgroup.

### IMPROVEMENTS

Expand Down
21 changes: 20 additions & 1 deletion server/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,26 @@ func startInProcess(svrCtx *server.Context, clientCtx client.Context, opts Start
indexerService.SetLogger(servercmtlog.CometLoggerWrapper{Logger: idxLogger})

g.Go(func() error {
return indexerService.Start()
errCh := make(chan error, 1)
go func() {
if err := indexerService.Start(); err != nil {
errCh <- err
}
}()

select {
case <-ctx.Done():
logger.Info("stopping evm indexer service due to context cancellation")
if err := indexerService.Stop(); err != nil {
logger.Error("failed to stop evm indexer service", "error", err.Error())
}
return ctx.Err()
case err := <-errCh:
if err != nil {
logger.Error("evm indexer service failed", "error", err.Error())
}
return err
}
})
}

Expand Down
Loading