Merge pull request #82 from marcwittke/hotfix/5.1.14

InvokeAsync fixed
marcwittke · Aug 23, 2019 · 262ec8e · 262ec8e
2 parents 8f7e967 + 0171fe5
commit 262ec8e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/src/abstractions/Backend.Fx/Patterns/DependencyInjection/BackendFxApplication.cs b/src/abstractions/Backend.Fx/Patterns/DependencyInjection/BackendFxApplication.cs
@@ -112,9 +112,29 @@ public void Invoke(Action action, IIdentity identity, TenantId tenantId)
             }
         }
 
-        public async Task InvokeAsync(Action action, IIdentity identity, TenantId tenantId, CancellationToken cancellationToken)
+        public async Task InvokeAsync(Func<Task> awaitableAsyncAction, IIdentity identity, TenantId tenantId)
         {
-            await Task.Factory.StartNew(() => Invoke(action, identity, tenantId), cancellationToken);
+            using (BeginScope(new SystemIdentity(), tenantId))
+            {
+                using (var unitOfWork = CompositionRoot.GetInstance<IUnitOfWork>())
+                {
+                    try
+                    {
+                        unitOfWork.Begin();
+                        await awaitableAsyncAction.Invoke();
+                        unitOfWork.Complete();
+                    }
+                    catch (TargetInvocationException ex)
+                    {
+                        ExceptionLogger.LogException(ex.InnerException ?? ex);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.Info(ex);
+                        ExceptionLogger.LogException(ex);
+                    }
+                }
+            }
         }
 
         /// <summary>

diff --git a/src/abstractions/Backend.Fx/Patterns/DependencyInjection/IBackendFxApplication.cs b/src/abstractions/Backend.Fx/Patterns/DependencyInjection/IBackendFxApplication.cs
@@ -40,7 +40,7 @@ public interface IBackendFxApplication : IDisposable
 
         void Invoke(Action action, IIdentity identity, TenantId tenantId);
 
-        Task InvokeAsync(Action action, IIdentity identity, TenantId tenantId, CancellationToken cancellationToken = default);
+        Task InvokeAsync(Func<Task> awaitableAsyncAction, IIdentity identity, TenantId tenantId);
 
         void Run<TJob>() where TJob : class, IJob;
 

diff --git a/src/abstractions/Backend.Fx/Patterns/EventAggregation/Integration/EventBus.cs b/src/abstractions/Backend.Fx/Patterns/EventAggregation/Integration/EventBus.cs
@@ -126,7 +126,7 @@ protected virtual async Task ProcessAsync(string eventName, EventProcessingConte
                 foreach (var subscription in subscriptions)
                 {
                     await _application.InvokeAsync(
-                        () => subscription.Process(eventName, context),
+                        () => Task.Factory.StartNew(() => subscription.Process(eventName, context)),
                         new SystemIdentity(),
                         context.TenantId);
                 }
@@ -136,7 +136,7 @@ protected virtual async Task ProcessAsync(string eventName, EventProcessingConte
                 Logger.Info($"No handler registered. Ignoring {eventName} event");
             }
         }
-        
+
         protected virtual void Dispose(bool disposing)
         { }