Improved http timeout handling

Co-authored-by: Qstick <qstick@gmail.com>
pull/4083/head
Bogdan 1 year ago committed by Qstick
parent 5d0f83e85e
commit e2fd830059

@ -131,6 +131,18 @@ namespace NzbDrone.Common.Test.Http
response.Content.Should().NotBeNullOrWhiteSpace();
}
[Test]
public void should_throw_timeout_request()
{
var request = new HttpRequest($"https://{_httpBinHost}/delay/10");
request.RequestTimeout = new TimeSpan(0, 0, 5);
Assert.ThrowsAsync<WebException>(async () => await Subject.ExecuteAsync(request));
ExceptionVerification.ExpectedErrors(0);
}
[Test]
public async Task should_execute_https_get()
{

@ -102,6 +102,8 @@ namespace NzbDrone.Common.Http.Dispatchers
var httpClient = GetClient(request.Url);
try
{
using var responseMessage = await httpClient.SendAsync(requestMessage, HttpCompletionOption.ResponseHeadersRead, cts.Token);
{
byte[] data = null;
@ -129,6 +131,11 @@ namespace NzbDrone.Common.Http.Dispatchers
return new HttpResponse(request, new HttpHeader(headers), data, responseMessage.StatusCode, responseMessage.Version);
}
}
catch (OperationCanceledException ex) when (cts.IsCancellationRequested)
{
throw new WebException("Http request timed out", ex.InnerException, WebExceptionStatus.Timeout, null);
}
}
protected virtual System.Net.Http.HttpClient GetClient(HttpUri uri)
{

Loading…
Cancel
Save