cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-31 00:50:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some cancellation token issues with auto update

Browse Source
This commit is contained in:
Cyberboss
2020-05-31 15:12:24 -04:00
parent 6b7b893280
commit 92b63db42e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Instance.cs
+3 -3
View File
@@ -234,7 +234,7 @@ namespace Tgstation.Server.Host.Components
.AsQueryable()
.Where(x => x.CommitSha == startSha && x.Instance.Id == metadata.Id)
.Include(x => x.ActiveTestMerges).ThenInclude(x => x.TestMerge)
.FirstOrDefaultAsync(cancellationToken);
.FirstOrDefaultAsync(jobCancellationToken);
async Task UpdateRevInfo(string currentHead, bool onOrigin)
{
@@ -326,7 +326,7 @@ namespace Tgstation.Server.Host.Components
if (hasDbChanges)
try
{
await databaseContext.Save(cancellationToken).ConfigureAwait(false);
await databaseContext.Save(jobCancellationToken).ConfigureAwait(false);
}
catch
{
@@ -369,7 +369,7 @@ namespace Tgstation.Server.Host.Components
DreamMaker.DeploymentProcess,
cancellationToken).ConfigureAwait(false);
await jobManager.WaitForJobCompletion(compileProcessJob, user, cancellationToken, default).ConfigureAwait(false);
await jobManager.WaitForJobCompletion(compileProcessJob, user, default, cancellationToken).ConfigureAwait(false);
}
catch (OperationCanceledException)
{