mirror of
https://github.com/tgstation/tgstation-server.git
synced 2026-08-25 05:56:58 +01:00
InfiniteTask from function to property
This commit is contained in:
@@ -854,7 +854,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
|
||||
var heartbeatSeconds = ActiveLaunchParameters.HeartbeatSeconds.Value;
|
||||
var heartbeat = heartbeatSeconds == 0
|
||||
|| !controller.DMApiAvailable
|
||||
? Extensions.TaskExtensions.InfiniteTask()
|
||||
? Extensions.TaskExtensions.InfiniteTask
|
||||
: Task.Delay(
|
||||
TimeSpan.FromSeconds(heartbeatSeconds),
|
||||
cancellationToken);
|
||||
|
||||
@@ -14,6 +14,11 @@ namespace Tgstation.Server.Host.Extensions
|
||||
/// </summary>
|
||||
static readonly TaskCompletionSource InfiniteTaskCompletionSource = new ();
|
||||
|
||||
/// <summary>
|
||||
/// Gets a <see cref="Task"/> that never completes.
|
||||
/// </summary>
|
||||
public static Task InfiniteTask => InfiniteTaskCompletionSource.Task;
|
||||
|
||||
/// <summary>
|
||||
/// Create a <see cref="Task"/> that can be awaited while respecting a given <paramref name="cancellationToken"/>.
|
||||
/// </summary>
|
||||
@@ -53,11 +58,5 @@ namespace Tgstation.Server.Host.Extensions
|
||||
|
||||
return await task;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Creates a <see cref="Task"/> that never completes.
|
||||
/// </summary>
|
||||
/// <returns>A never ending <see cref="Task"/>.</returns>
|
||||
public static Task InfiniteTask() => InfiniteTaskCompletionSource.Task;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -271,7 +271,7 @@ namespace Tgstation.Server.Host.Jobs
|
||||
}
|
||||
|
||||
if (noMoreJobsShouldStart && !handler.Started)
|
||||
await Extensions.TaskExtensions.InfiniteTask().WithToken(cancellationToken);
|
||||
await Extensions.TaskExtensions.InfiniteTask.WithToken(cancellationToken);
|
||||
|
||||
Task cancelTask = null;
|
||||
using (jobCancellationToken.Register(() => cancelTask = CancelJob(job, canceller, true, cancellationToken)))
|
||||
|
||||
@@ -380,7 +380,7 @@ namespace Tgstation.Server.Host.Swarm
|
||||
? asyncDelayer.Delay(
|
||||
TimeSpan.FromMinutes(UpdateCommitTimeoutMinutes),
|
||||
cancellationToken)
|
||||
: Extensions.TaskExtensions.InfiniteTask().WithToken(cancellationToken);
|
||||
: Extensions.TaskExtensions.InfiniteTask.WithToken(cancellationToken);
|
||||
|
||||
var commitTask = Task.WhenAny(commitTcsTask, timeoutTask);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user