t0w0bi/ClubPenguinServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sanitize queue processing

Browse Source
This commit is contained in:
rootdarkarchon
2023-01-14 12:57:34 +01:00
parent 9605be8d4a
commit aa177583e0
1 changed files with 48 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
MareSynchronosServer/MareSynchronosStaticFilesServer/Services/RequestQueueService.cs
View File

@@ -35,22 +35,34 @@ public class RequestQueueService : IHostedService
return QueueStatus.Waiting; return QueueStatus.Waiting;
} }
await _queueSemaphore.WaitAsync().ConfigureAwait(false); try
QueueStatus status = QueueStatus.Waiting;
var idx = Array.FindIndex(_userQueueRequests, r => r == null);
if (idx == -1)
{ {
_queue.Enqueue(request); await _queueSemaphore.WaitAsync().ConfigureAwait(false);
status = QueueStatus.Waiting; QueueStatus status = QueueStatus.Waiting;
} var idx = Array.FindIndex(_userQueueRequests, r => r == null);
else if (idx == -1)
{ {
DequeueIntoSlot(request, idx); _queue.Enqueue(request);
status = QueueStatus.Ready; status = QueueStatus.Waiting;
} }
_queueSemaphore.Release(); else
{
DequeueIntoSlot(request, idx);
status = QueueStatus.Ready;
}
return status; return status;
}
catch (Exception ex)
{
_logger.LogError(ex, "Error during EnqueueUser");
}
finally
{
_queueSemaphore.Release();
}
throw new Exception("Error during EnqueueUser");
} }
public bool StillEnqueued(Guid request, string user, out int queuePosition) public bool StillEnqueued(Guid request, string user, out int queuePosition)
@@ -92,24 +104,35 @@ public class RequestQueueService : IHostedService
{ {
while (!ct.IsCancellationRequested) while (!ct.IsCancellationRequested)
{ {
await _queueProcessingSemaphore.WaitAsync(ct).ConfigureAwait(false); try
await _queueSemaphore.WaitAsync(ct).ConfigureAwait(false);
for (int i = 0; i < _userQueueRequests.Length; i++)
{ {
if (_userQueueRequests[i] != null && !_userQueueRequests[i].IsActive && _userQueueRequests[i].ExpirationDate < DateTime.UtcNow) _userQueueRequests[i] = null; await _queueProcessingSemaphore.WaitAsync(ct).ConfigureAwait(false);
await _queueSemaphore.WaitAsync(ct).ConfigureAwait(false);
if (_userQueueRequests[i] == null) for (int i = 0; i < _userQueueRequests.Length; i++)
{ {
if (_queue.TryDequeue(out var request)) if (_userQueueRequests[i] != null && !_userQueueRequests[i].IsActive && _userQueueRequests[i].ExpirationDate < DateTime.UtcNow) _userQueueRequests[i] = null;
if (_userQueueRequests[i] == null)
{ {
DequeueIntoSlot(request, i); if (_queue.TryDequeue(out var request))
{
DequeueIntoSlot(request, i);
}
} }
if (!_queue.Any()) break;
} }
if (!_queue.Any()) break;
} }
_queueProcessingSemaphore.Release(); catch (Exception ex)
_queueSemaphore.Release(); {
_logger.LogError(ex, "Error during Queue processing");
}
finally
{
_queueProcessingSemaphore.Release();
_queueSemaphore.Release();
}
_metrics.SetGaugeTo(MetricsAPI.GaugeDownloadQueue, _queue.Count); _metrics.SetGaugeTo(MetricsAPI.GaugeDownloadQueue, _queue.Count);