Backup_Repos/Readarr
1
0
Fork 0
mirror of https://github.com/Readarr/Readarr synced 2026-04-20 11:51:06 +02:00
Code Issues Projects Releases Wiki Activity

Add support for custom RetryAfter in RequestLimitReachedException

Browse source 
(cherry picked from commit 47cf8e6430b7f7704ce2f1524fa9e3c8e6f9b47a)
This commit is contained in:
Mark McDowall 2023-04-13 19:54:37 -07:00 committed by Bogdan
parent 63506e5a72
commit 816969d0f5
4 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/NzbDrone.Common/Http/HttpRequestBuilder.cs
View file

@ -20,6 +20,7 @@ public class HttpRequestBuilder
public Dictionary<string, string> Segments { get; private set; }
public HttpHeader Headers { get; private set; }
public bool SuppressHttpError { get; set; }
public IEnumerable<HttpStatusCode> SuppressHttpErrorStatusCodes { get; set; }
public bool LogHttpError { get; set; }
public bool UseSimplifiedUserAgent { get; set; }
public bool AllowAutoRedirect { get; set; }
@ -102,6 +103,7 @@ protected virtual void Apply(HttpRequest request)
{
request.Method = Method;
request.SuppressHttpError = SuppressHttpError;
request.SuppressHttpErrorStatusCodes = SuppressHttpErrorStatusCodes;
request.LogHttpError = LogHttpError;
request.UseSimplifiedUserAgent = UseSimplifiedUserAgent;
request.AllowAutoRedirect = AllowAutoRedirect;

2
src/NzbDrone.Common/Http/TooManyRequestsException.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
namespace NzbDrone.Common.Http
{

11
src/NzbDrone.Core/Indexers/Exceptions/RequestLimitReachedException.cs
View file

@ -1,9 +1,12 @@
using NzbDrone.Common.Exceptions;
using System;
using NzbDrone.Common.Exceptions;
namespace NzbDrone.Core.Indexers.Exceptions
{
public class RequestLimitReachedException : NzbDroneException
{
public TimeSpan RetryAfter { get; private set; }
public RequestLimitReachedException(string message, params object[] args)
: base(message, args)
{
@ -13,5 +16,11 @@ public RequestLimitReachedException(string message)
: base(message)
{
}
public RequestLimitReachedException(string message, TimeSpan retryAfter)
: base(message)
{
RetryAfter = retryAfter;
}
}
}

12
src/NzbDrone.Core/Indexers/HttpIndexerBase.cs
View file

@ -207,9 +207,17 @@ protected virtual IList<ReleaseInfo> FetchReleases(Func<IIndexerRequestGenerator
_indexerStatusService.RecordFailure(Definition.Id);
_logger.Warn("{0} {1}", this, ex.Message);
}
catch (RequestLimitReachedException)
catch (RequestLimitReachedException ex)
{
_indexerStatusService.RecordFailure(Definition.Id, TimeSpan.FromHours(1));
if (ex.RetryAfter != TimeSpan.Zero)
{
_indexerStatusService.RecordFailure(Definition.Id, ex.RetryAfter);
}
else
{
_indexerStatusService.RecordFailure(Definition.Id, TimeSpan.FromHours(1));
}
_logger.Warn("API Request Limit reached for {0}", this);
}
catch (ApiKeyException)