Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't throw exception unless needed

Browse Source
This commit is contained in:
crobibero 2020-12-10 08:25:05 -07:00
parent e621244405
commit a9aafbaf5a
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
View File

@ -611,30 +611,25 @@ namespace Emby.Server.Implementations.LiveTv.Listings
CancellationToken cancellationToken, CancellationToken cancellationToken,
HttpCompletionOption completionOption = HttpCompletionOption.ResponseContentRead) HttpCompletionOption completionOption = HttpCompletionOption.ResponseContentRead)
{ {
HttpResponseMessage response = null; var response = await _httpClientFactory.CreateClient(NamedClient.Default)
try .SendAsync(options, completionOption, cancellationToken).ConfigureAwait(false);
if (response.IsSuccessStatusCode)
{ {
response = await _httpClientFactory.CreateClient(NamedClient.Default)
.SendAsync(options, completionOption, cancellationToken).ConfigureAwait(false);
response.EnsureSuccessStatusCode();
return response; return response;
} }
catch (HttpRequestException ex)
// Response is automatically disposed in the calling function,
// so dispose manually if not returning.
response.Dispose();
if (!enableRetry || (int)response.StatusCode >= 500)
{ {
response?.Dispose(); throw new HttpRequestException(
_tokens.Clear(); string.Format(CultureInfo.InvariantCulture, "Request failed: {0}", response.ReasonPhrase),
null,
if (!ex.StatusCode.HasValue || (int)ex.StatusCode.Value >= 500) response.StatusCode);
{
enableRetry = false;
}
if (!enableRetry)
{
throw;
}
} }
_tokens.Clear();
options.Headers.TryAddWithoutValidation("token", await GetToken(providerInfo, cancellationToken).ConfigureAwait(false)); options.Headers.TryAddWithoutValidation("token", await GetToken(providerInfo, cancellationToken).ConfigureAwait(false));
return await Send(options, false, providerInfo, cancellationToken).ConfigureAwait(false); return await Send(options, false, providerInfo, cancellationToken).ConfigureAwait(false);
} }