github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-16 02:02:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restore checking of HTTP StatusCode on ApiRequests; remove checking of response.ErrorException

Browse source
This commit is contained in:
smcpeck 2017-02-28 20:48:00 -06:00
parent 3ee4ae34d5
commit b5fc7692d6
1 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Ombi.Api/ApiRequest.cs
View file

@ -57,8 +57,9 @@ namespace Ombi.Api
{ {
var client = new RestClient { BaseUrl = baseUri }; var client = new RestClient { BaseUrl = baseUri };
var response = client.Execute<T>(request); var response = client.Execute<T>(request);
Log.Trace($"Request made to {client.BaseUrl} with status code {response.StatusCode}. The response was {response.Content}"); Log.Trace($"Request made to {response.ResponseUri} with status code {response.StatusCode}. The response was {response.Content}");
/**
if (response.ErrorException != null) if (response.ErrorException != null)
{ {
var message = "Error retrieving response. Check inner details for more info."; var message = "Error retrieving response. Check inner details for more info.";
@ -66,11 +67,12 @@ namespace Ombi.Api
Log.Error(response.ErrorException.InnerException); Log.Error(response.ErrorException.InnerException);
throw new ApiRequestException(message, response.ErrorException); throw new ApiRequestException(message, response.ErrorException);
} }
**/
//if (response.StatusCode == HttpStatusCode.OK) if (response.StatusCode == HttpStatusCode.OK)
return response.Data; return response.Data;
//else else
// throw new Exception($"Got StatusCode={response.StatusCode} for {baseUri}."); throw new ApiRequestException($"Got StatusCode={response.StatusCode} for {response.ResponseUri}.");
} }
@ -85,8 +87,9 @@ namespace Ombi.Api
{ {
var client = new RestClient { BaseUrl = baseUri }; var client = new RestClient { BaseUrl = baseUri };
var response = client.Execute(request); var response = client.Execute(request);
Log.Trace($"Request made to {client.BaseUrl} with status code {response.StatusCode}. The response was {response.Content}"); Log.Trace($"Request made to {response.ResponseUri} with status code {response.StatusCode}. The response was {response.Content}");
/**
if (response.ErrorException != null) if (response.ErrorException != null)
{ {
Log.Error(response.ErrorException); Log.Error(response.ErrorException);
@ -94,11 +97,12 @@ namespace Ombi.Api
var message = "Error retrieving response. Check inner details for more info."; var message = "Error retrieving response. Check inner details for more info.";
throw new ApiRequestException(message, response.ErrorException); throw new ApiRequestException(message, response.ErrorException);
} }
**/
//if (response.StatusCode == HttpStatusCode.OK) if (response.StatusCode == HttpStatusCode.OK)
return DeserializeXml<T>(response.Content); return DeserializeXml<T>(response.Content);
//else else
// throw new Exception($"Got StatusCode={response.StatusCode} for {baseUri}."); throw new ApiRequestException($"Got StatusCode={response.StatusCode} for {response.ResponseUri}.");
} }
@ -106,8 +110,9 @@ namespace Ombi.Api
{ {
var client = new RestClient { BaseUrl = baseUri }; var client = new RestClient { BaseUrl = baseUri };
var response = client.Execute(request); var response = client.Execute(request);
Log.Trace($"Request made to {client.BaseUrl} with status code {response.StatusCode}. The response was {response.Content}"); Log.Trace($"Request made to {response.ResponseUri} with status code {response.StatusCode}. The response was {response.Content}");
/**
if (response.ErrorException != null) if (response.ErrorException != null)
{ {
Log.Error(response.ErrorException); Log.Error(response.ErrorException);
@ -115,11 +120,12 @@ namespace Ombi.Api
var message = "Error retrieving response. Check inner details for more info."; var message = "Error retrieving response. Check inner details for more info.";
throw new ApiRequestException(message, response.ErrorException); throw new ApiRequestException(message, response.ErrorException);
} }
**/
//if (response.StatusCode == HttpStatusCode.OK) if (response.StatusCode == HttpStatusCode.OK)
return JsonConvert.DeserializeObject<T>(response.Content, _settings); return JsonConvert.DeserializeObject<T>(response.Content, _settings);
//else else
// throw new Exception($"Got StatusCode={response.StatusCode} for {baseUri}."); throw new ApiRequestException($"Got StatusCode={response.StatusCode} for {response.ResponseUri}.");
} }
private T DeserializeXml<T>(string input) private T DeserializeXml<T>(string input)