mirror of
https://github.com/Caraxi/mare.server.git
synced 2025-12-14 02:34:15 +01:00
adjust queue processing
This commit is contained in:
parent
255798c0c6
commit
ba37a25869
4 changed files with 38 additions and 30 deletions
|
|
@ -9,28 +9,14 @@ public class RequestFileStreamResult : FileStreamResult
|
|||
private readonly Guid _requestId;
|
||||
private readonly RequestQueueService _requestQueueService;
|
||||
private readonly MareMetrics _mareMetrics;
|
||||
private readonly CancellationTokenSource _releaseCts = new();
|
||||
private bool _releasedSlot = false;
|
||||
|
||||
public RequestFileStreamResult(Guid requestId, int secondsUntilRelease, RequestQueueService requestQueueService,
|
||||
MareMetrics mareMetrics, Stream fileStream, string contentType) : base(fileStream, contentType)
|
||||
public RequestFileStreamResult(Guid requestId, RequestQueueService requestQueueService, MareMetrics mareMetrics,
|
||||
Stream fileStream, string contentType) : base(fileStream, contentType)
|
||||
{
|
||||
_requestId = requestId;
|
||||
_requestQueueService = requestQueueService;
|
||||
_mareMetrics = mareMetrics;
|
||||
_mareMetrics.IncGauge(MetricsAPI.GaugeCurrentDownloads);
|
||||
|
||||
// forcefully release slot after secondsUntilRelease
|
||||
_ = Task.Run(async () =>
|
||||
{
|
||||
try
|
||||
{
|
||||
await Task.Delay(TimeSpan.FromSeconds(secondsUntilRelease), _releaseCts.Token).ConfigureAwait(false);
|
||||
_requestQueueService.FinishRequest(_requestId);
|
||||
_releasedSlot = true;
|
||||
}
|
||||
catch { }
|
||||
});
|
||||
}
|
||||
|
||||
public override void ExecuteResult(ActionContext context)
|
||||
|
|
@ -45,10 +31,7 @@ public class RequestFileStreamResult : FileStreamResult
|
|||
}
|
||||
finally
|
||||
{
|
||||
_releaseCts.Cancel();
|
||||
|
||||
if (!_releasedSlot)
|
||||
_requestQueueService.FinishRequest(_requestId);
|
||||
_requestQueueService.FinishRequest(_requestId);
|
||||
|
||||
_mareMetrics.DecGauge(MetricsAPI.GaugeCurrentDownloads);
|
||||
}
|
||||
|
|
@ -66,10 +49,7 @@ public class RequestFileStreamResult : FileStreamResult
|
|||
}
|
||||
finally
|
||||
{
|
||||
_releaseCts.Cancel();
|
||||
|
||||
if (!_releasedSlot)
|
||||
_requestQueueService.FinishRequest(_requestId);
|
||||
_requestQueueService.FinishRequest(_requestId);
|
||||
|
||||
_mareMetrics.DecGauge(MetricsAPI.GaugeCurrentDownloads);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue