hopefully it's fine now?
This commit is contained in:
@@ -418,7 +418,7 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IL
|
||||
|
||||
public Task CyclePauseAsync(PairUniqueIdentifier ident)
|
||||
{
|
||||
var timeoutCts = new CancellationTokenSource(TimeSpan.FromSeconds(8));
|
||||
var timeoutCts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
|
||||
_ = Task.Run(async () =>
|
||||
{
|
||||
var token = timeoutCts.Token;
|
||||
@@ -430,20 +430,19 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IL
|
||||
return;
|
||||
}
|
||||
|
||||
var originalPermissions = entry.SelfPermissions;
|
||||
var targetPermissions = originalPermissions;
|
||||
targetPermissions.SetPaused(!originalPermissions.IsPaused());
|
||||
var targetPermissions = entry.SelfPermissions;
|
||||
targetPermissions.SetPaused(paused: true);
|
||||
|
||||
await UserSetPairPermissions(new UserPermissionsDto(entry.User, targetPermissions)).ConfigureAwait(false);
|
||||
|
||||
var applied = false;
|
||||
var pauseApplied = false;
|
||||
while (!token.IsCancellationRequested)
|
||||
{
|
||||
if (_pairCoordinator.Ledger.TryGetEntry(ident, out var updated) && updated is not null)
|
||||
{
|
||||
if (updated.SelfPermissions == targetPermissions)
|
||||
{
|
||||
applied = true;
|
||||
pauseApplied = true;
|
||||
entry = updated;
|
||||
break;
|
||||
}
|
||||
@@ -453,13 +452,16 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IL
|
||||
Logger.LogTrace("Waiting for permissions change for {uid}", ident.UserId);
|
||||
}
|
||||
|
||||
if (!applied)
|
||||
if (!pauseApplied)
|
||||
{
|
||||
Logger.LogWarning("CyclePauseAsync timed out waiting for pause acknowledgement for {uid}", ident.UserId);
|
||||
return;
|
||||
}
|
||||
|
||||
Logger.LogDebug("CyclePauseAsync toggled paused for {uid} to {state}", ident.UserId, targetPermissions.IsPaused());
|
||||
targetPermissions.SetPaused(paused: false);
|
||||
await UserSetPairPermissions(new UserPermissionsDto(entry.User, targetPermissions)).ConfigureAwait(false);
|
||||
|
||||
Logger.LogDebug("CyclePauseAsync completed pause cycle for {uid}", ident.UserId);
|
||||
}
|
||||
catch (OperationCanceledException)
|
||||
{
|
||||
@@ -479,16 +481,26 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IL
|
||||
}
|
||||
|
||||
public async Task PauseAsync(UserData userData)
|
||||
{
|
||||
await SetPausedStateAsync(userData, paused: true).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
public async Task UnpauseAsync(UserData userData)
|
||||
{
|
||||
await SetPausedStateAsync(userData, paused: false).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
private async Task SetPausedStateAsync(UserData userData, bool paused)
|
||||
{
|
||||
var pairIdent = new PairUniqueIdentifier(userData.UID);
|
||||
if (!_pairCoordinator.Ledger.TryGetEntry(pairIdent, out var entry) || entry is null)
|
||||
{
|
||||
Logger.LogWarning("PauseAsync: pair {uid} not found in ledger", userData.UID);
|
||||
Logger.LogWarning("SetPausedStateAsync: pair {uid} not found in ledger", userData.UID);
|
||||
return;
|
||||
}
|
||||
|
||||
var permissions = entry.SelfPermissions;
|
||||
permissions.SetPaused(paused: true);
|
||||
permissions.SetPaused(paused);
|
||||
await UserSetPairPermissions(new UserPermissionsDto(userData, permissions)).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user