Skip to content

Fix: Check Attempts For Error even when Attempts is zero #131

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Check Attempts For Error even when Attempts is zero #131

Show file tree
Hide file tree
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
40 changes: 6 additions & 34 deletions retry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,38 +136,6 @@ func DoWithData[T any](retryableFunc RetryableFuncWithData[T], opts ...Option) (
return emptyT, err
}

// Setting attempts to 0 means we'll retry until we succeed
var lastErr error
if config.attempts == 0 {
for {
t, err := retryableFunc()
if err == nil {
return t, nil
}

if !IsRecoverable(err) {
return emptyT, err
}

if !config.retryIf(err) {
return emptyT, err
}

lastErr = err

config.onRetry(n, err)
n++
select {
case <-config.timer.After(delay(config, n, err)):
case <-config.context.Done():
if config.wrapContextErrorWithLastError {
return emptyT, Error{context.Cause(config.context), lastErr}
}
return emptyT, context.Cause(config.context)
}
}
}

errorLog := Error{}

attemptsForError := make(map[error]uint, len(config.attemptsForError))
Expand All @@ -184,6 +152,10 @@ func DoWithData[T any](retryableFunc RetryableFuncWithData[T], opts ...Option) (

errorLog = append(errorLog, unpackUnrecoverable(err))

if !IsRecoverable(err) {
return emptyT, err
}

if !config.retryIf(err) {
break
}
Expand All @@ -198,8 +170,9 @@ func DoWithData[T any](retryableFunc RetryableFuncWithData[T], opts ...Option) (
}
}

// Setting attempts to 0 means we'll retry until we succeed
// if this is last attempt - don't wait
if n == config.attempts-1 {
if config.attempts != 0 && n == config.attempts-1 {
break
}
n++
Expand All @@ -213,7 +186,6 @@ func DoWithData[T any](retryableFunc RetryableFuncWithData[T], opts ...Option) (
return emptyT, append(errorLog, context.Cause(config.context))
}

shouldRetry = shouldRetry && n < config.attempts
}

if config.lastErrorOnly {
Expand Down
7 changes: 4 additions & 3 deletions retry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ func TestRetryIf_ZeroAttempts(t *testing.T) {
return err.Error() != "special"
}),
Delay(time.Nanosecond),
LastErrorOnly(true),
Attempts(0),
)
assert.Error(t, err)
Expand Down Expand Up @@ -215,16 +216,15 @@ func TestLastErrorOnly(t *testing.T) {
func TestUnrecoverableError(t *testing.T) {
attempts := 0
testErr := errors.New("error")
expectedErr := Error{testErr}
err := Do(
func() error {
attempts++
return Unrecoverable(testErr)
},
Attempts(2),
)
assert.Equal(t, expectedErr, err)
assert.Equal(t, testErr, errors.Unwrap(err))
assert.Error(t, err)
assert.Equal(t, Unrecoverable(testErr), err)
assert.Equal(t, 1, attempts, "unrecoverable error broke the loop")
}

Expand Down Expand Up @@ -457,6 +457,7 @@ func TestContext(t *testing.T) {
cancel()
}
}),
LastErrorOnly(true),
Context(ctx),
Attempts(0),
)
Expand Down