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

Merge pull request #592 from Cyberboss/IdkTheresSomethingThatNeedsDoing

Browse Source 
Fix repo clone job using wrong CancellationToken
This commit is contained in:
Jordan Brown
2018-09-02 02:31:15 -04:00
committed by GitHub
parent 1ab0f26fbe e6c4101d9a
commit 938b0814be
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/Controllers/RepositoryController.cs
+3 -3
View File
@@ -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<IDatabaseContext>();
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);