Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better error messages when download client connection fails

This commit is contained in:
Keivan Beigi 2014-10-13 11:07:05 -07:00
parent 690569cbbc
commit dcf434abd3
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetProxy.cs
View File

@ -185,15 +185,15 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
request.JsonSerializer = new JsonNetSerializer(); request.JsonSerializer = new JsonNetSerializer();
request.RequestFormat = DataFormat.Json; request.RequestFormat = DataFormat.Json;
request.AddBody(jsonRequest); request.AddBody(jsonRequest);
return request; return request;
} }
private void CheckForError(IRestResponse response) private void CheckForError(IRestResponse response)
{ {
if (response.ResponseStatus != ResponseStatus.Completed) if (response.ErrorException != null)
{ {
throw new DownloadClientException("Unable to connect to NzbGet, please check your settings", response.ErrorException); throw new DownloadClientException("Unable to connect to NzbGet. " + response.ErrorException.Message, response.ErrorException);
} }
if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized) if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized)

8
src/NzbDrone.Core/HealthCheck/Checks/DownloadClientCheck.cs
View File

@ -15,9 +15,9 @@ namespace NzbDrone.Core.HealthCheck.Checks
public override HealthCheck Check() public override HealthCheck Check()
{ {
var downloadClients = _downloadClientProvider.GetDownloadClients(); var downloadClients = _downloadClientProvider.GetDownloadClients().ToList();
if (downloadClients.Count() == 0) if (!downloadClients.Any())
{ {
return new HealthCheck(GetType(), HealthCheckResult.Warning, "No download client is available"); return new HealthCheck(GetType(), HealthCheckResult.Warning, "No download client is available");
} }
@ -29,9 +29,9 @@ namespace NzbDrone.Core.HealthCheck.Checks
downloadClient.GetItems(); downloadClient.GetItems();
} }
} }
catch (Exception) catch (Exception e)
{ {
return new HealthCheck(GetType(), HealthCheckResult.Error, "Unable to communicate with download client"); return new HealthCheck(GetType(), HealthCheckResult.Error, "Unable to communicate with download client " + e.Message);
} }
return new HealthCheck(GetType()); return new HealthCheck(GetType());