Updates

Handling cancellation on main engine
Stateflows · Aug 27, 2024 · e51d3c5 · e51d3c5
1 parent 9ecc71b
commit e51d3c5
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/Core/Stateflows/Common/Engine/StateflowsEngine.cs b/Core/Stateflows/Common/Engine/StateflowsEngine.cs
@@ -5,7 +5,6 @@
 using System.Threading.Tasks;
 using System.Collections.Generic;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.DependencyInjection;
 using Stateflows.Common.Engine;
 using Stateflows.Common.Classes;
@@ -14,7 +13,7 @@
 
 namespace Stateflows.Common
 {
-    internal class StateflowsEngine : /*BackgroundService, */IHostedService
+    internal class StateflowsEngine : IHostedService
     {
         private readonly IServiceScope Scope;
         private IServiceProvider ServiceProvider => Scope.ServiceProvider;
@@ -23,6 +22,8 @@ internal class StateflowsEngine : /*BackgroundService, */IHostedService
         private readonly IStateflowsTenantProvider TenantProvider;
         private readonly ITenantAccessor TenantAccessor;
         private Dictionary<string, IEventProcessor> processors;
+        private readonly CancellationTokenSource CancellationTokenSource = new CancellationTokenSource();
+
         private Dictionary<string, IEventProcessor> Processors
             => processors ??= ServiceProvider.GetRequiredService<IEnumerable<IEventProcessor>>().ToDictionary(p => p.BehaviorType, p => p);
 
@@ -55,9 +56,9 @@ public Task StartAsync(CancellationToken cancellationToken)
         {
             executionTask = Task.Run(() =>
             {
-                while (!cancellationToken.IsCancellationRequested)
+                while (!CancellationTokenSource.Token.IsCancellationRequested)
                 {
-                    if (!EventQueue.WaitAsync(cancellationToken).GetAwaiter().GetResult())
+                    if (!EventQueue.WaitAsync(CancellationTokenSource.Token).GetAwaiter().GetResult())
                     {
                         continue;
                     }
@@ -147,6 +148,8 @@ public async Task<EventStatus> ProcessEventAsync<TEvent>(BehaviorId id, TEvent @
 
         public Task StopAsync(CancellationToken cancellationToken)
         {
+            CancellationTokenSource.Cancel();
+
             executionTask.Wait();
 
             return Task.CompletedTask;