friendlynamazu/server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

something

Browse Source
This commit is contained in:
rootdarkarchon
2024-01-14 21:41:22 +01:00
parent 1c97fd9150
commit c674e4eccd
2 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/RequestController.cs
View File

@@ -9,7 +9,6 @@ public class RequestController : ControllerBase
{ {
private readonly CachedFileProvider _cachedFileProvider; private readonly CachedFileProvider _cachedFileProvider;
private readonly RequestQueueService _requestQueue; private readonly RequestQueueService _requestQueue;
private static readonly SemaphoreSlim _parallelRequestSemaphore = new(500);
public RequestController(ILogger<RequestController> logger, CachedFileProvider cachedFileProvider, RequestQueueService requestQueue) : base(logger) public RequestController(ILogger<RequestController> logger, CachedFileProvider cachedFileProvider, RequestQueueService requestQueue) : base(logger)
{ {
@@ -21,26 +20,18 @@ public class RequestController : ControllerBase
[Route(MareFiles.Request_Cancel)] [Route(MareFiles.Request_Cancel)]
public async Task<IActionResult> CancelQueueRequest(Guid requestId) public async Task<IActionResult> CancelQueueRequest(Guid requestId)
{ {
await _parallelRequestSemaphore.WaitAsync(HttpContext.RequestAborted);
try try
{ {
_requestQueue.RemoveFromQueue(requestId, MareUser, IsPriority); _requestQueue.RemoveFromQueue(requestId, MareUser, IsPriority);
return Ok(); return Ok();
} }
catch (OperationCanceledException) { return BadRequest(); } catch (OperationCanceledException) { return BadRequest(); }
finally
{
_parallelRequestSemaphore.Release();
}
} }
[HttpPost] [HttpPost]
[Route(MareFiles.Request_Enqueue)] [Route(MareFiles.Request_Enqueue)]
public async Task<IActionResult> PreRequestFilesAsync([FromBody] IEnumerable<string> files) public async Task<IActionResult> PreRequestFilesAsync([FromBody] IEnumerable<string> files)
{ {
await _parallelRequestSemaphore.WaitAsync(HttpContext.RequestAborted);
try try
{ {
foreach (var file in files) foreach (var file in files)
@@ -50,33 +41,23 @@ public class RequestController : ControllerBase
} }
Guid g = Guid.NewGuid(); Guid g = Guid.NewGuid();
_requestQueue.EnqueueUser(new(g, MareUser, files.ToList()), IsPriority); await _requestQueue.EnqueueUser(new(g, MareUser, files.ToList()), IsPriority, HttpContext.RequestAborted);
return Ok(g); return Ok(g);
} }
catch (OperationCanceledException) { return BadRequest(); } catch (OperationCanceledException) { return BadRequest(); }
finally
{
_parallelRequestSemaphore.Release();
}
} }
[HttpGet] [HttpGet]
[Route(MareFiles.Request_Check)] [Route(MareFiles.Request_Check)]
public async Task<IActionResult> CheckQueueAsync(Guid requestId, [FromBody] IEnumerable<string> files) public async Task<IActionResult> CheckQueueAsync(Guid requestId, [FromBody] IEnumerable<string> files)
{ {
await _parallelRequestSemaphore.WaitAsync(HttpContext.RequestAborted);
try try
{ {
if (!_requestQueue.StillEnqueued(requestId, MareUser, IsPriority)) if (!_requestQueue.StillEnqueued(requestId, MareUser, IsPriority))
_requestQueue.EnqueueUser(new(requestId, MareUser, files.ToList()), IsPriority); await _requestQueue.EnqueueUser(new(requestId, MareUser, files.ToList()), IsPriority, HttpContext.RequestAborted);
return Ok(); return Ok();
} }
catch (OperationCanceledException) { return BadRequest(); } catch (OperationCanceledException) { return BadRequest(); }
finally
{
_parallelRequestSemaphore.Release();
}
} }
} }

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

@@ -44,8 +44,13 @@ public class RequestQueueService : IHostedService
req.MarkActive(); req.MarkActive();
} }
public void EnqueueUser(UserRequest request, bool isPriority) public async Task EnqueueUser(UserRequest request, bool isPriority, CancellationToken token)
{ {
while (_queueProcessingSemaphore.CurrentCount == 0)
{
await Task.Delay(50, token).ConfigureAwait(false);
}
_logger.LogDebug("Enqueueing req {guid} from {user} for {file}", request.RequestId, request.User, string.Join(", ", request.FileIds)); _logger.LogDebug("Enqueueing req {guid} from {user} for {file}", request.RequestId, request.User, string.Join(", ", request.FileIds));
GetQueue(isPriority).Enqueue(request); GetQueue(isPriority).Enqueue(request);