Skip to content
This repository has been archived by the owner on May 11, 2024. It is now read-only.

fix(cmd): fix some context close issues #650

Merged
merged 2 commits into from
Mar 20, 2024
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
7 changes: 5 additions & 2 deletions driver/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,10 @@ func (d *Driver) eventLoop() {

// doSyncWithBackoff performs a synchronising operation with a backoff strategy.
doSyncWithBackoff := func() {
if err := backoff.Retry(d.doSync, backoff.NewConstantBackOff(d.RetryInterval)); err != nil {
if err := backoff.Retry(
d.doSync,
backoff.WithContext(backoff.NewConstantBackOff(d.RetryInterval), d.ctx),
); err != nil {
log.Error("Sync L2 execution engine's block chain error", "error", err)
}
}
Expand Down Expand Up @@ -192,7 +195,7 @@ func (d *Driver) reportProtocolStatus() {
maxNumBlocks = configs.BlockMaxProposals
return nil
},
backoff.NewConstantBackOff(d.RetryInterval),
backoff.WithContext(backoff.NewConstantBackOff(d.RetryInterval), d.ctx),
); err != nil {
log.Error("Failed to get protocol state variables", "error", err)
return
Expand Down
2 changes: 1 addition & 1 deletion pkg/chain_iterator/block_batch_iterator.go
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ func (i *BlockBatchIterator) Iter() error {
return nil
}

if err := backoff.Retry(iterOp, backoff.NewConstantBackOff(i.retryInterval)); err != nil {
if err := backoff.Retry(iterOp, backoff.WithContext(backoff.NewConstantBackOff(i.retryInterval), i.ctx)); err != nil {
return err
}

Expand Down
Loading