fix(tasks): don't throw errors on cancellation

sitkoru · Dec 5, 2024 · 1f664ba · 1f664ba
1 parent c3d5e80
commit 1f664ba
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/src/Sitko.Core.Tasks/Execution/BaseTaskExecutor.cs b/src/Sitko.Core.Tasks/Execution/BaseTaskExecutor.cs
@@ -99,7 +99,14 @@ private async Task<TTask> ExecuteTaskAsync(Guid id, CancellationToken cancellati
                     await scopedRepository.UpdateAsync(scopedTask, CancellationToken.None);
                 }
 
-                await Task.Delay(TimeSpan.FromSeconds(5), activityTaskCts.Token);
+                try
+                {
+                    await Task.Delay(TimeSpan.FromSeconds(5), activityTaskCts.Token);
+                }
+                catch (TaskCanceledException)
+                {
+                    Logger.LogDebug("Activity task was cancelled");
+                }
             }
         }, activityTaskCts.Token);
         try
@@ -156,7 +163,15 @@ private async Task<TTask> ExecuteTaskAsync(Guid id, CancellationToken cancellati
     public void Dispose()
     {
         activityTaskCts.Cancel();
-        activityTask?.GetAwaiter().GetResult();
+        try
+        {
+            activityTask?.GetAwaiter().GetResult();
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex, "Error in activity task: {ErrorText}", ex.ToString());
+        }
+
         GC.SuppressFinalize(this);
     }
 }