Merge pull request #6410 from abpframework/maliming/hangfire-async

Make HangfireJobExecutionAdapter async.
abpframework · Dec 1, 2020 · 1b36843 · 1b36843
2 parents c615aed + 3840a42
commit 1b36843
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 25 deletions.
diff --git a/....BackgroundJobs.HangFire/Volo/Abp/BackgroundJobs/Hangfire/HangfireBackgroundJobManager.cs b/....BackgroundJobs.HangFire/Volo/Abp/BackgroundJobs/Hangfire/HangfireBackgroundJobManager.cs
@@ -11,23 +11,14 @@ public class HangfireBackgroundJobManager : IBackgroundJobManager, ITransientDep
         public virtual Task<string> EnqueueAsync<TArgs>(TArgs args, BackgroundJobPriority priority = BackgroundJobPriority.Normal,
             TimeSpan? delay = null)
         {
-            if (!delay.HasValue)
-            {
-                return Task.FromResult(
-                    BackgroundJob.Enqueue<HangfireJobExecutionAdapter<TArgs>>(
-                        adapter => adapter.Execute(args)
-                    )
-                );
-            }
-            else
-            {
-                return Task.FromResult(
-                    BackgroundJob.Schedule<HangfireJobExecutionAdapter<TArgs>>(
-                        adapter => adapter.Execute(args),
-                        delay.Value
-                    )
-                );
-            }
+            return Task.FromResult(delay.HasValue
+                ? BackgroundJob.Schedule<HangfireJobExecutionAdapter<TArgs>>(
+                    adapter => adapter.ExecuteAsync(args),
+                    delay.Value
+                )
+                : BackgroundJob.Enqueue<HangfireJobExecutionAdapter<TArgs>>(
+                    adapter => adapter.ExecuteAsync(args)
+                ));
         }
     }
-}
+}
diff --git a/...p.BackgroundJobs.HangFire/Volo/Abp/BackgroundJobs/Hangfire/HangfireJobExecutionAdapter.cs b/...p.BackgroundJobs.HangFire/Volo/Abp/BackgroundJobs/Hangfire/HangfireJobExecutionAdapter.cs
@@ -1,8 +1,6 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using Volo.Abp.Threading;
 
 namespace Volo.Abp.BackgroundJobs.Hangfire
 {
@@ -22,7 +20,7 @@ public HangfireJobExecutionAdapter(
             Options = options.Value;
         }
 
-        public void Execute(TArgs args)
+        public async Task ExecuteAsync(TArgs args)
         {
             if (!Options.IsJobExecutionEnabled)
             {
@@ -39,8 +37,8 @@ public void Execute(TArgs args)
             {
                 var jobType = Options.GetJob(typeof(TArgs)).JobType;
                 var context = new JobExecutionContext(scope.ServiceProvider, jobType, args);
-                AsyncHelper.RunSync(() => JobExecuter.ExecuteAsync(context));
+                await JobExecuter.ExecuteAsync(context);
             }
         }
     }
-}
+}