Merge pull request #23 from Cysharp/hotfix/ServiceProviderScope

Create scope service while BatchEngineService is starting.

Author: neuecc

sandbox/SingleContainedAppWithConfig/Program.cs

@@ -8,7 +8,7 @@ public class Baz : BatchBase
 {
     private readonly IOptions<SingleContainedAppWithConfig.AppConfig> config;
     // Batche inject Config on constructor.
-    public Baz(IOptions<SingleContainedAppWithConfig.AppConfig> config)
+    public Baz(IOptions<SingleContainedAppWithConfig.AppConfig> config, MyServiceA serviceA, MyServiceB serviceB, MyServiceC serviceC)
     {
         this.config = config;
     }
@@ -25,6 +25,9 @@ public void Hello3()
     }
 }
 
+public class MyServiceA { }
+public class MyServiceB { }
+public class MyServiceC { }
 
 namespace SingleContainedAppWithConfig
 {
@@ -39,6 +42,10 @@ await MicroBatchFramework.BatchHost.CreateDefaultBuilder()
                     services.AddOptions();
                     // mapping json element to class
                     services.Configure<AppConfig>(hostContext.Configuration.GetSection("AppConfig"));
+
+                    services.AddScoped<MyServiceA>();
+                    services.AddTransient<MyServiceB>();
+                    services.AddSingleton<MyServiceC>();
                 })
                 .RunBatchEngineAsync<Baz>(args);
         }

src/MicroBatchFramework/BatchEngineService.cs

@@ -5,6 +5,7 @@
 using System.Runtime.ExceptionServices;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace MicroBatchFramework
 {
@@ -15,7 +16,7 @@ public sealed class BatchEngineService : IHostedService
         MethodInfo methodInfo;
         IApplicationLifetime appLifetime;
         ILogger<BatchEngine> logger;
-        IServiceProvider provider;
+        IServiceScope scope;
         IBatchInterceptor interceptor;
         Task runningTask;
         CancellationTokenSource cancellationTokenSource;
@@ -31,23 +32,23 @@ public BatchEngineService(IApplicationLifetime appLifetime, Type type, MethodInf
             this.type = type;
             this.methodInfo = methodInfo;
             this.appLifetime = appLifetime;
-            this.provider = provider;
+            this.scope = provider.CreateScope();
             this.logger = logger;
             this.interceptor = (provider.GetService(typeof(IBatchInterceptor)) as IBatchInterceptor) ?? NullBatchInterceptor.Default;
             this.cancellationTokenSource = new CancellationTokenSource();
         }
 
         public async Task StartAsync(CancellationToken cancellationToken)
         {
-            await interceptor.OnBatchEngineBeginAsync(provider, logger);
+            await interceptor.OnBatchEngineBeginAsync(scope.ServiceProvider, logger);
 
             // raise after all event registered
             appLifetime.ApplicationStarted.Register(async state =>
             {
                 var self = (BatchEngineService)state;
                 try
                 {
-                    var engine = new BatchEngine(self.logger, self.provider, self.interceptor, self.cancellationTokenSource.Token);
+                    var engine = new BatchEngine(self.logger, scope.ServiceProvider, self.interceptor, self.cancellationTokenSource.Token);
                     if (self.methodInfo != null)
                     {
                         self.runningTask = engine.RunAsync(self.type, self.methodInfo, self.args);
@@ -85,6 +86,7 @@ public async Task StopAsync(CancellationToken cancellationToken)
             finally
             {
                 await interceptor.OnBatchEngineEndAsync();
+                scope.Dispose();
             }
         }
     }