Make sure job DI scope is disposed

FoundatioFx · Oct 14, 2024 · 8fc7bfc · 8fc7bfc
1 parent 0800eb6
commit 8fc7bfc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Foundatio.Extensions.Hosting/Jobs/ScheduledJobRunner.cs b/src/Foundatio.Extensions.Hosting/Jobs/ScheduledJobRunner.cs
@@ -143,7 +143,7 @@ public async Task StartAsync(CancellationToken cancellationToken = default)
                 try
                 {
                     using var activity = FoundatioDiagnostics.ActivitySource.StartActivity("Job " + Options.Name, ActivityKind.Server);
-                    var scope = _serviceProvider.CreateScope();
+                    await using var scope = _serviceProvider.CreateAsyncScope();
 
                     var job = Options.JobFactory(scope.ServiceProvider);
                     var result = await job.TryRunAsync(cancellationToken).AnyContext();

diff --git a/src/Foundatio.Extensions.Hosting/Startup/StartupExtensions.cs b/src/Foundatio.Extensions.Hosting/Startup/StartupExtensions.cs
@@ -26,7 +26,7 @@ public static partial class StartupExtensions
 {
     public static async Task<RunStartupActionsResult> RunStartupActionsAsync(this IServiceProvider serviceProvider, CancellationToken shutdownToken = default)
     {
-        using var startupActionsScope = serviceProvider.CreateScope();
+        await using var startupActionsScope = serviceProvider.CreateAsyncScope();
         var sw = Stopwatch.StartNew();
         var logger = startupActionsScope.ServiceProvider.GetService<ILoggerFactory>()?.CreateLogger("StartupActions") ?? NullLogger.Instance;
         var startupActions = startupActionsScope.ServiceProvider.GetServices<StartupActionRegistration>().ToArray();

diff --git a/src/Foundatio/Jobs/JobRunner.cs b/src/Foundatio/Jobs/JobRunner.cs
@@ -181,7 +181,7 @@ public async Task<bool> RunAsync(CancellationToken cancellationToken = default)
                             {
                                 try
                                 {
-                                    var scope = _serviceProvider.CreateScope();
+                                    await using var scope = _serviceProvider.CreateAsyncScope();
                                     var jobInstance = _options.JobFactory(scope.ServiceProvider);
                                     await jobInstance.RunContinuousAsync(_options.Interval, _options.IterationLimit,
                                         cancellationToken).AnyContext();