Skip to content

loop: do not error out on context done in the executor #867

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
merged 1 commit into from
Dec 12, 2024
Merged

loop: do not error out on context done in the executor #867

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func (s *executor) run(mainCtx context.Context,
defer s.wg.Done()

err := s.batcher.Run(mainCtx)
if err != nil {
if err != nil && !errors.Is(err, context.Canceled) {
select {
case batcherErrChan <- err:
case <-mainCtx.Done():
Expand Down Expand Up @@ -229,10 +229,10 @@ func (s *executor) run(mainCtx context.Context,
}

case err := <-blockErrorChan:
return fmt.Errorf("block error: %v", err)
return fmt.Errorf("block error: %w", err)

case err := <-batcherErrChan:
return fmt.Errorf("batcher error: %v", err)
return fmt.Errorf("batcher error: %w", err)

case <-mainCtx.Done():
return mainCtx.Err()
Expand Down
Loading