Don't leak timer

craigpastro · Feb 5, 2022 · 7a0bb9f · 7a0bb9f
1 parent f691e5c
commit 7a0bb9f
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/retry.go b/retry.go
@@ -73,10 +73,19 @@ func Do(ctx context.Context, b Backoff, f RetryFunc) error {
  return rerr.Unwrap()
  }
 
+ // ctx.Done() has priority, so we test it alone first
  select {
  case <-ctx.Done():
  return ctx.Err()
- case <-time.After(next):
+ default:
+ }
+
+ t := time.NewTimer(next)
+ select {
+ case <-ctx.Done():
+ t.Stop()
+ return ctx.Err()
+ case <-t.C:
  continue
  }
  }