From a107036261c5c7bd60ef7db316e500dbec8df11f Mon Sep 17 00:00:00 2001 From: Andras Banki-Horvath Date: Thu, 12 Dec 2024 17:50:13 +0100 Subject: [PATCH] loop: do not error out on context done in the executor --- executor.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/executor.go b/executor.go index 257074fa..4428ace3 100644 --- a/executor.go +++ b/executor.go @@ -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(): @@ -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()