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

some fixes maybe

Browse Source 
kms
This commit is contained in:
Stanley Dimant
2024-04-28 12:21:24 +02:00
committed by Loporrit
parent 128a5a0aa2
commit 1e353229ac
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,7 +98,7 @@ public class RequestQueueService : IHostedService
public Task StartAsync(CancellationToken cancellationToken) public Task StartAsync(CancellationToken cancellationToken)
{ {
_queueTimer = new System.Timers.Timer(250); _queueTimer = new System.Timers.Timer(500);
_queueTimer.Elapsed += ProcessQueue; _queueTimer.Elapsed += ProcessQueue;
_queueTimer.AutoReset = true; _queueTimer.AutoReset = true;
_queueTimer.Start(); _queueTimer.Start();
@@ -156,20 +156,30 @@ public class RequestQueueService : IHostedService
while (true) while (true)
{ {
if (_priorityQueue.TryDequeue(out var prioRequest)) if (_priorityQueue.TryPeek(out var prioRequest))
{ {
if (prioRequest.IsCancelled) continue; if (prioRequest.IsCancelled)
{
_priorityQueue.TryDequeue(out var _);
continue;
}
if (_cachedFileProvider.AnyFilesDownloading(prioRequest.FileIds)) continue; if (_cachedFileProvider.AnyFilesDownloading(prioRequest.FileIds)) continue;
DequeueIntoSlot(prioRequest, i); _priorityQueue.TryDequeue(out var priorityRequest);
DequeueIntoSlot(priorityRequest, i);
break; break;
} }
if (_queue.TryDequeue(out var request)) if (_queue.TryPeek(out var request))
{ {
if (request.IsCancelled) continue; if (request.IsCancelled)
{
_queue.TryDequeue(out var _);
continue;
}
if (_cachedFileProvider.AnyFilesDownloading(request.FileIds)) continue; if (_cachedFileProvider.AnyFilesDownloading(request.FileIds)) continue;
_queue.TryDequeue(out var priorityRequest);
DequeueIntoSlot(request, i); DequeueIntoSlot(request, i);
break; break;
} }