fix incorrect disposals (finally)

Author: aspriddell

DragonFruit.Data.Queues/Jobs/Job.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace DragonFruit.Data.Queues.Jobs
 {
@@ -18,13 +17,5 @@ public abstract class Job
         /// Performs the current job as an asynchronous task
         /// </summary>
         public abstract Task Perform(IServiceProvider scope);
-
-        internal async Task PerformInternal(IServiceScope scope)
-        {
-            using (scope)
-            {
-                await Perform(scope.ServiceProvider).ConfigureAwait(false);
-            }
-        }
     }
 }

DragonFruit.Data.Queues/QueueProcessor.cs

@@ -198,16 +198,16 @@ protected override async Task ExecuteAsync(CancellationToken cancellation)
 
                             if (ScopeLifetime == ScopeOptions.PerCycle)
                             {
-                                jobTasks.Add(job.PerformInternal(jobCycleScope.Value));
+                                jobTasks.Add(job.Perform(jobCycleScope.Value.ServiceProvider));
                             }
                             else if (batchScope != null)
                             {
-                                jobTasks.Add(job.PerformInternal(batchScope));
+                                jobTasks.Add(job.Perform(batchScope.ServiceProvider));
                             }
                             else
                             {
                                 var scope = _scopeFactory.CreateScope();
-                                var jobTask = job.PerformInternal(scope);
+                                var jobTask = job.Perform(scope.ServiceProvider);
 
                                 jobTasks.Add(jobTask);
                                 jobScopes.Value.Add(scope);