From e6c4101d9a2d1c44338d530deb823fe3fa2fcdc5 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 2 Sep 2018 01:59:17 -0400 Subject: [PATCH] Fix repo clone job using wrong CancellationToken --- .../Controllers/RepositoryController.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs index 4de3cae653..111146ca9e 100644 --- a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs +++ b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs @@ -170,13 +170,13 @@ namespace Tgstation.Server.Host.Controllers var api = currentModel.ToApi(); await jobManager.RegisterOperation(job, async (paramJob, serviceProvider, progressReporter, ct) => { - using (var repos = await repoManager.CloneRepository(new Uri(origin), cloneBranch, currentModel.AccessUser, currentModel.AccessToken, progressReporter, cancellationToken).ConfigureAwait(false)) + using (var repos = await repoManager.CloneRepository(new Uri(origin), cloneBranch, currentModel.AccessUser, currentModel.AccessToken, progressReporter, ct).ConfigureAwait(false)) { if (repos == null) throw new JobException("Filesystem conflict while cloning repository!"); var db = serviceProvider.GetRequiredService(); - if (await PopulateApi(api, repos, db, Instance, cancellationToken).ConfigureAwait(false)) - await db.Save(cancellationToken).ConfigureAwait(false); + if (await PopulateApi(api, repos, db, Instance, ct).ConfigureAwait(false)) + await db.Save(ct).ConfigureAwait(false); } }, cancellationToken).ConfigureAwait(false);