Mirrors/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2024-11-04 10:02:40 +01:00
Code Issues Releases Wiki Activity

Fixed: Improve some request failure messaging

Browse Source 
(cherry picked from commit e968919e63616e30cc401964bd51db8e9e0e26de)

Fixes #8152
This commit is contained in:
bakerboy448 2023-02-22 19:36:12 -06:00 committed by Qstick
parent dfc9f74116
commit 89b609a221
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/NzbDrone.Core/Download/Clients/Deluge/Deluge.cs
View File

@ -177,7 +177,7 @@ public override IEnumerable<DownloadClientItem> GetItems()
} }
// Here we detect if Deluge is managing the torrent and whether the seed criteria has been met. // Here we detect if Deluge is managing the torrent and whether the seed criteria has been met.
// This allows drone to delete the torrent as appropriate. // This allows Radarr to delete the torrent as appropriate.
item.CanMoveFiles = item.CanBeRemoved = item.CanMoveFiles = item.CanBeRemoved =
torrent.IsAutoManaged && torrent.IsAutoManaged &&
torrent.StopAtRatio && torrent.StopAtRatio &&
@ -270,7 +270,7 @@ private ValidationFailure TestConnection()
case WebExceptionStatus.SecureChannelFailure: case WebExceptionStatus.SecureChannelFailure:
return new NzbDroneValidationFailure("UseSsl", "Unable to connect through SSL") return new NzbDroneValidationFailure("UseSsl", "Unable to connect through SSL")
{ {
DetailedDescription = "Drone is unable to connect to Deluge using SSL. This problem could be computer related. Please try to configure both Radarr and Deluge to not use SSL." DetailedDescription = "Radarr is unable to connect to Deluge using SSL. This problem could be computer related. Please try to configure both Radarr and Deluge to not use SSL."
}; };
default: default:
return new NzbDroneValidationFailure(string.Empty, "Unknown exception: " + ex.Message); return new NzbDroneValidationFailure(string.Empty, "Unknown exception: " + ex.Message);

12
src/NzbDrone.Core/ImportLists/HttpImportListBase.cs
View File

@ -189,7 +189,7 @@ protected virtual ValidationFailure TestConnection()
if (releases.Empty()) if (releases.Empty())
{ {
return new NzbDroneValidationFailure(string.Empty, return new NzbDroneValidationFailure(string.Empty,
"No results were returned from your import list, please check your settings.") "No results were returned from your import list, please check your settings and the log for details.")
{ IsWarning = true }; { IsWarning = true };
} }
} }
@ -199,21 +199,21 @@ protected virtual ValidationFailure TestConnection()
} }
catch (UnsupportedFeedException ex) catch (UnsupportedFeedException ex)
{ {
_logger.Warn(ex, "Import List feed is not supported"); _logger.Warn(ex, "Import list feed is not supported");
return new ValidationFailure(string.Empty, "Import List feed is not supported: " + ex.Message); return new ValidationFailure(string.Empty, "Import list feed is not supported: " + ex.Message);
} }
catch (ImportListException ex) catch (ImportListException ex)
{ {
_logger.Warn(ex, "Unable to connect to list"); _logger.Warn(ex, "Unable to connect to list");
return new ValidationFailure(string.Empty, "Unable to connect to list. " + ex.Message); return new ValidationFailure(string.Empty, $"Unable to connect to import list: {ex.Message}. Check the log surrounding this error for details.");
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.Warn(ex, "Unable to connect to list"); _logger.Warn(ex, "Unable to connect to import list");
return new ValidationFailure(string.Empty, "Unable to connect to list, check the log for more details"); return new ValidationFailure(string.Empty, $"Unable to connect to import list: {ex.Message}. Check the log surrounding this error for details.");
} }
return null; return null;

8
src/NzbDrone.Core/ImportLists/Radarr/RadarrV3Proxy.cs
View File

@ -57,13 +57,13 @@ public ValidationFailure Test(RadarrSettings settings)
return new ValidationFailure("ApiKey", "API Key is invalid"); return new ValidationFailure("ApiKey", "API Key is invalid");
} }
_logger.Error(ex, "Unable to send test message"); _logger.Error(ex, "Unable to connect to import list.");
return new ValidationFailure("ApiKey", "Unable to send test message"); return new ValidationFailure(string.Empty, $"Unable to connect to import list: {ex.Message}. Check the log surrounding this error for details.");
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.Error(ex, "Unable to send test message"); _logger.Error(ex, "Unable to connect to import list.");
return new ValidationFailure("", "Unable to send test message"); return new ValidationFailure(string.Empty, $"Unable to connect to import list: {ex.Message}. Check the log surrounding this error for details.");
} }
return null; return null;

4
src/NzbDrone.Core/Indexers/HttpIndexerBase.cs
View File

@ -383,14 +383,14 @@ protected virtual ValidationFailure TestConnection()
{ {
_logger.Warn(ex, "Unable to connect to indexer"); _logger.Warn(ex, "Unable to connect to indexer");
return new ValidationFailure(string.Empty, "Unable to connect to indexer, check the log for more details"); return new ValidationFailure(string.Empty, "Unable to connect to indexer. " + ex.Message);
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.Warn(ex, "Unable to connect to indexer"); _logger.Warn(ex, "Unable to connect to indexer");
return new ValidationFailure(string.Empty, "Unable to connect to indexer, check the log for more details"); return new ValidationFailure(string.Empty, $"Unable to connect to indexer: {ex.Message}. Check the log surrounding this error for details");
} }
return null; return null;

2
src/NzbDrone.Core/Indexers/Newznab/Newznab.cs
View File

@ -155,7 +155,7 @@ protected virtual ValidationFailure TestCapabilities()
{ {
_logger.Warn(ex, "Unable to connect to indexer: " + ex.Message); _logger.Warn(ex, "Unable to connect to indexer: " + ex.Message);
return new ValidationFailure(string.Empty, "Unable to connect to indexer, check the log for more details"); return new ValidationFailure(string.Empty, $"Unable to connect to indexer: {ex.Message}. Check the log surrounding this error for details");
} }
} }

2
src/NzbDrone.Core/Indexers/Torznab/Torznab.cs
View File

@ -146,7 +146,7 @@ protected virtual ValidationFailure TestCapabilities()
{ {
_logger.Warn(ex, "Unable to connect to indexer: " + ex.Message); _logger.Warn(ex, "Unable to connect to indexer: " + ex.Message);
return new ValidationFailure(string.Empty, "Unable to connect to indexer, check the log for more details"); return new ValidationFailure(string.Empty, $"Unable to connect to indexer: {ex.Message}. Check the log surrounding this error for details");
} }
} }