Fix not decrementing number of running queue tasks on fail (#192)

Co-authored-by: Jan Temešinko <[email protected]>
jamesmh · Oct 5, 2020 · 1df1269 · 1df1269
1 parent 612204c
commit 1df1269
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/Src/Coravel/Queuing/Queue.cs b/Src/Coravel/Queuing/Queue.cs
@@ -208,18 +208,18 @@ private async Task InvokeTask(ActionOrAsyncFunc task)
 
                 await task.Invoke();
 
-                Interlocked.Decrement(ref this._tasksRunningCount);
                 this._logger?.LogInformation("Queued task finished...");
                 await this.TryDispatchEvent(new QueueTaskCompleted(task.Guid));
             }
             catch (Exception e)
             {
                 await this.TryDispatchEvent(new DequeuedTaskFailed(task));
 
-                if (this._errorHandler != null)
-                {
-                    this._errorHandler(e);
-                }
+                _errorHandler?.Invoke(e);
+            }
+            finally
+            {
+                Interlocked.Decrement(ref this._tasksRunningCount);
             }
         }
     }

diff --git a/Src/UnitTests/CoravelUnitTests/Queuing/QueueMetricTests.cs b/Src/UnitTests/CoravelUnitTests/Queuing/QueueMetricTests.cs
@@ -32,7 +32,11 @@ public async Task TestQueueHasCorrectNumberOfJobsRunning()
             Queue queue = new Queue(null, new DispatcherStub());
 
             queue.QueueAsyncTask(() => Task.Delay(200));
-            queue.QueueAsyncTask(() => Task.Delay(200));
+            queue.QueueAsyncTask(async () =>
+            {
+                await Task.Delay(200);
+                throw new Exception("Test exception");
+            });
             queue.QueueAsyncTask(() => Task.Delay(200));
 
             Assert.Equal(3, queue.GetMetrics().WaitingCount());
@@ -45,7 +49,10 @@ public async Task TestQueueHasCorrectNumberOfJobsRunning()
             Assert.Equal(3, metrics.RunningCount());
 
             await consumingTask;
-        }   
+
+            metrics = queue.GetMetrics();
+            Assert.Equal(0, metrics.RunningCount());
+        }
 
         [Fact]
         public async Task TestAllGuidMethods()