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

Give JobHandler a proper constructor

Browse Source
This commit is contained in:
Jordan Brown
2018-11-02 14:58:51 -04:00
parent 04e8f866d6
commit bca6d95cc4
2 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Core/JobHandler.cs
+10 -20
View File
@@ -9,24 +9,25 @@ namespace Tgstation.Server.Host.Core
/// </summary>
sealed class JobHandler : IDisposable
{
/// <summary>
/// The <see cref="Task"/> being run
/// </summary>
readonly Task task;
/// <summary>
/// The <see cref="CancellationTokenSource"/> for <see cref="task"/>
/// </summary>
readonly CancellationTokenSource cancellationTokenSource;
/// <summary>
/// The <see cref="Task"/> being run
/// </summary>
readonly Task task;
/// <summary>
/// Construct a <see cref="JobHandler"/>
/// </summary>
/// <param name="task">The value of <see cref="Task"/></param>
/// <param name="cancellationTokenSource">The value of <see cref="cancellationTokenSource"/></param>
JobHandler(Task task, CancellationTokenSource cancellationTokenSource)
/// <param name="job">A <see cref="Func{T, TResult}"/> taking a <see cref="CancellationToken"/> and returning a <see cref="Task"/> that the <see cref="JobHandler"/> will wrap</param>
public JobHandler(Func<CancellationToken, Task> job)
{
this.task = task;
this.cancellationTokenSource = cancellationTokenSource;
if (job == null)
throw new ArgumentNullException(nameof(job));
cancellationTokenSource = new CancellationTokenSource();
task = job(cancellationTokenSource.Token);
}
/// <inehritdoc />
@@ -54,16 +55,5 @@ namespace Tgstation.Server.Host.Core
/// Cancels <see cref="task"/>
/// </summary>
public void Cancel() => cancellationTokenSource.Cancel();
/// <summary>
/// Create a <see cref="JobHandler"/>
/// </summary>
/// <param name="job">A <see cref="Func{T, TResult}"/> taking a <see cref="CancellationToken"/> and returning a <see cref="Task"/> that the <see cref="JobHandler"/> will wrap</param>
/// <returns>A new <see cref="JobHandler"/></returns>
public static JobHandler Create(Func<CancellationToken, Task> job)
{
var cts = new CancellationTokenSource();
return new JobHandler(job(cts.Token), cts);
}
}
}
src/Tgstation.Server.Host/Core/JobManager.cs
+1 -1
View File
@@ -168,7 +168,7 @@ namespace Tgstation.Server.Host.Core
await databaseContext.Save(cancellationToken).ConfigureAwait(false);
logger.LogDebug("Starting job {0}: {1}...", job.Id, job.Description);
var jobHandler = JobHandler.Create(x => RunJob(job, (jobParam, serviceProvider, ct) =>
var jobHandler = new JobHandler(x => RunJob(job, (jobParam, serviceProvider, ct) =>
operation(jobParam, serviceProvider, y =>
{
lock (this)