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

Fixed: Improve some request failure messaging

This commit is contained in:
bakerboy448 2023-02-22 19:36:12 -06:00 committed by GitHub
parent 6ec32eb45d
commit e968919e63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,7 +175,7 @@ namespace NzbDrone.Core.Download.Clients.Deluge
} }
// 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 Sonarr to delete the torrent as appropriate.
item.CanMoveFiles = item.CanBeRemoved = item.CanMoveFiles = item.CanBeRemoved =
torrent.IsAutoManaged && torrent.IsAutoManaged &&
torrent.StopAtRatio && torrent.StopAtRatio &&
@ -254,12 +254,12 @@ namespace NzbDrone.Core.Download.Clients.Deluge
case WebExceptionStatus.ConnectionClosed: case WebExceptionStatus.ConnectionClosed:
return new NzbDroneValidationFailure("UseSsl", "Verify SSL settings") return new NzbDroneValidationFailure("UseSsl", "Verify SSL settings")
{ {
DetailedDescription = "Please verify your SSL configuration on both Deluge and NzbDrone." DetailedDescription = "Please verify your SSL configuration on both Deluge and Sonarr."
}; };
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 drone and Deluge to not use SSL." DetailedDescription = "Sonarr is unable to connect to Deluge using SSL. This problem could be computer related. Please try to configure both Sonarr 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);

6
src/NzbDrone.Core/ImportLists/Custom/CustomImportProxy.cs
View File

@ -49,13 +49,13 @@ namespace NzbDrone.Core.ImportLists.Custom
return new ValidationFailure("BaseUrl", "It seems we are unauthorized to make this request."); return new ValidationFailure("BaseUrl", "It seems we are unauthorized to make this request.");
} }
_logger.Error(ex, "Unable to send test message"); _logger.Error(ex, "Unable to connect to import list.");
return new ValidationFailure("BaseUrl", $"We are unable to make the request to that URL. StatusCode: {ex.Response.StatusCode}"); return new ValidationFailure("BaseUrl", $"We are unable to make the request to that URL. StatusCode: {ex.Response.StatusCode}");
} }
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;

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

@ -215,7 +215,7 @@ namespace NzbDrone.Core.ImportLists
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 };
} }
} }
@ -233,13 +233,13 @@ namespace NzbDrone.Core.ImportLists
{ {
_logger.Warn(ex, "Unable to connect to import list"); _logger.Warn(ex, "Unable to connect to import list");
return new ValidationFailure(string.Empty, "Unable to connect to import 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 import list"); _logger.Warn(ex, "Unable to connect to import list");
return new ValidationFailure(string.Empty, "Unable to connect to import 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/Sonarr/SonarrV3Proxy.cs
View File

@ -63,13 +63,13 @@ namespace NzbDrone.Core.ImportLists.Sonarr
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;

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

@ -389,7 +389,7 @@ namespace NzbDrone.Core.Indexers
{ {
_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

@ -134,7 +134,7 @@ namespace NzbDrone.Core.Indexers.Newznab
{ {
_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

@ -126,7 +126,7 @@ namespace NzbDrone.Core.Indexers.Torznab
{ {
_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/Notifications/Notifiarr/NotifiarrProxy.cs
View File

@ -57,7 +57,7 @@ namespace NzbDrone.Core.Notifications.Notifiarr
catch (Exception ex) catch (Exception ex)
{ {
_logger.Error(ex, ex.Message); _logger.Error(ex, ex.Message);
return new ValidationFailure("", "Unable to send test notification. Check the log for more details."); return new ValidationFailure(string.Empty, "Unable to send test notification: {ex.Message}. Check the log surrounding this error for details");
} }
} }