Apply suggestions from code review

andreasohlund · ramonsmits · web-flow · commit fb0bf12dfd06 · 2025-03-20T18:05:02.000+01:00
Co-authored-by: Ramon Smits &lt;ramon.smits@gmail.com&gt;
diff --git a/src/ServiceControl.Infrastructure/AsyncTimer.cs b/src/ServiceControl.Infrastructure/AsyncTimer.cs
@@ -51,7 +51,9 @@ public TimerJob(Func<CancellationToken, Task<TimerJobExecutionResult>> callback,
                     catch (Exception ex)
                     {
                         consecutiveFailures++;
-                        var backoffDelay = TimeSpan.FromSeconds(int.Min(6, consecutiveFailures) * 10);
+                        const int MaxDelayDurationInSeconds = 60;
+                        var delayInSeconds = consecutiveFailures * 10;
+                        var backoffDelay = TimeSpan.FromSeconds(int.Min(MaxDelayDurationInSeconds, delayInSeconds));
 
                         await Task.Delay(backoffDelay, token).ConfigureAwait(false);
 
@@ -75,6 +77,7 @@ public async Task Stop(CancellationToken cancellationToken)
 
         await tokenSource.CancelAsync().ConfigureAwait(false);
         tokenSource.Dispose();
+        tokenSource = null;
 
         if (task == null)
         {

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,9 @@ public TimerJob(Func<CancellationToken, Task<TimerJobExecutionResult>> callback,`
`51`	`51`	`catch (Exception ex)`
`52`	`52`	`{`
`53`	`53`	`consecutiveFailures++;`
`54`		`- var backoffDelay = TimeSpan.FromSeconds(int.Min(6, consecutiveFailures) * 10);`
	`54`	`+ const int MaxDelayDurationInSeconds = 60;`
	`55`	`+ var delayInSeconds = consecutiveFailures * 10;`
	`56`	`+ var backoffDelay = TimeSpan.FromSeconds(int.Min(MaxDelayDurationInSeconds, delayInSeconds));`
`55`	`57`
`56`	`58`	`await Task.Delay(backoffDelay, token).ConfigureAwait(false);`
`57`	`59`
`@@ -75,6 +77,7 @@ public async Task Stop(CancellationToken cancellationToken)`
`75`	`77`
`76`	`78`	`await tokenSource.CancelAsync().ConfigureAwait(false);`
`77`	`79`	`tokenSource.Dispose();`
	`80`	`+ tokenSource = null;`
`78`	`81`
`79`	`82`	`if (task == null)`
`80`	`83`	`{`