Merge pull request avast#125 from haaawk/fix_124

JaSei · web-flow · commit d20c351a2292 · 2025-02-24T10:09:03.000+01:00
Make sure DelayType function gets consistent values of n
diff --git a/retry.go b/retry.go
@@ -202,7 +202,7 @@ func DoWithData[T any](retryableFunc RetryableFuncWithData[T], opts ...Option) (
 		if n == config.attempts-1 {
 			break
 		}
-
+		n++
 		select {
 		case <-config.timer.After(delay(config, n, err)):
 		case <-config.context.Done():
@@ -213,7 +213,6 @@ func DoWithData[T any](retryableFunc RetryableFuncWithData[T], opts ...Option) (
 			return emptyT, append(errorLog, config.context.Err())
 		}
 
-		n++
 		shouldRetry = shouldRetry && n < config.attempts
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ func DoWithData[T any](retryableFunc RetryableFuncWithData[T], opts ...Option) (`
`202`	`202`	`if n == config.attempts-1 {`
`203`	`203`	`break`
`204`	`204`	`}`
`205`		`-`
	`205`	`+ n++`
`206`	`206`	`select {`
`207`	`207`	`case <-config.timer.After(delay(config, n, err)):`
`208`	`208`	`case <-config.context.Done():`
`@@ -213,7 +213,6 @@ func DoWithData[T any](retryableFunc RetryableFuncWithData[T], opts ...Option) (`
`213`	`213`	`return emptyT, append(errorLog, config.context.Err())`
`214`	`214`	`}`
`215`	`215`
`216`		`- n++`
`217`	`216`	`shouldRetry = shouldRetry && n < config.attempts`
`218`	`217`	`}`
`219`	`218`