ToxicMushroom/mare.server
1
0
Fork 0
mirror of https://github.com/Caraxi/mare.server.git synced 2025-12-13 14:24:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

some file server fixes I guess

Browse source
This commit is contained in:
rootdarkarchon 2024-01-13 12:08:49 +01:00
parent 810c6dbd45
commit 2c7ff6f73a
5 changed files with 53 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

12
MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/RequestController.cs
View file

@ -24,9 +24,10 @@ public class RequestController : ControllerBase
[Route(MareFiles.Request_Cancel)]
public async Task<IActionResult> CancelQueueRequest(Guid requestId)
{
await _parallelRequestSemaphore.WaitAsync(HttpContext.RequestAborted);
try
{
await _parallelRequestSemaphore.WaitAsync(HttpContext.RequestAborted);
_requestQueue.RemoveFromQueue(requestId, MareUser);
return Ok();
}
@ -41,9 +42,10 @@ public class RequestController : ControllerBase
[Route(MareFiles.Request_Enqueue)]
public async Task<IActionResult> PreRequestFilesAsync([FromBody] IEnumerable<string> files)
{
await _parallelRequestSemaphore.WaitAsync(HttpContext.RequestAborted);
try
{
await _parallelRequestSemaphore.WaitAsync(HttpContext.RequestAborted);
foreach (var file in files)
{
_logger.LogDebug("Prerequested file: " + file);
@ -66,6 +68,8 @@ public class RequestController : ControllerBase
[Route(MareFiles.Request_Check)]
public async Task<IActionResult> CheckQueueAsync(Guid requestId, [FromBody] IEnumerable<string> files)
{
await _parallelRequestSemaphore.WaitAsync(HttpContext.RequestAborted);
try
{
if (!await _requestQueue.StillEnqueued(requestId, MareUser, _mareDbContext))
@ -73,5 +77,9 @@ public class RequestController : ControllerBase
return Ok();
}
catch (OperationCanceledException) { return BadRequest(); }
finally
{
_parallelRequestSemaphore.Release();
}
}
}