From 2440f9cc37ab7ca63c2482b6a7254d4dbd8614a8 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 7 Aug 2018 20:19:27 -0400 Subject: [PATCH] JobManager attaches model BEFORE invoking --- src/Tgstation.Server.Host/Core/JobManager.cs | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/Tgstation.Server.Host/Core/JobManager.cs b/src/Tgstation.Server.Host/Core/JobManager.cs index bb2833d916..e4e13aa4d9 100644 --- a/src/Tgstation.Server.Host/Core/JobManager.cs +++ b/src/Tgstation.Server.Host/Core/JobManager.cs @@ -80,15 +80,11 @@ namespace Tgstation.Server.Host.Core { var oldJob = job; job = new Job { Id = oldJob.Id }; - try - { - await operation(job, scope.ServiceProvider, cancellationToken).ConfigureAwait(false); - } - finally - { - databaseContext = scope.ServiceProvider.GetRequiredService(); - databaseContext.Jobs.Attach(job); - } + databaseContext = scope.ServiceProvider.GetRequiredService(); + databaseContext.Jobs.Attach(job); + + await operation(job, scope.ServiceProvider, cancellationToken).ConfigureAwait(false); + logger.LogDebug("Job {0} completed!", job.Id); } catch (OperationCanceledException)