Skip to content

Commit

Permalink
Fixed: (Apps) Lower the severity for common messages
Browse files Browse the repository at this point in the history
  • Loading branch information
mynameisbogdan committed Jul 13, 2023
1 parent 9bac299 commit 3ce3f8a
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 35 deletions.
6 changes: 3 additions & 3 deletions src/NzbDrone.Core/Applications/Lidarr/Lidarr.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ public override ValidationResult Test()
switch (ex.Response.StatusCode)
{
case HttpStatusCode.Unauthorized:
_logger.Error(ex, "API Key is invalid");
_logger.Warn(ex, "API Key is invalid");
failures.AddIfNotNull(new ValidationFailure("ApiKey", "API Key is invalid"));
break;
case HttpStatusCode.BadRequest:
_logger.Error(ex, "Prowlarr URL is invalid");
_logger.Warn(ex, "Prowlarr URL is invalid");
failures.AddIfNotNull(new ValidationFailure("ProwlarrUrl", "Prowlarr URL is invalid, Lidarr cannot connect to Prowlarr"));
break;
case HttpStatusCode.SeeOther:
_logger.Error(ex, "Lidarr returned redirect and is invalid");
_logger.Warn(ex, "Lidarr returned redirect and is invalid");
failures.AddIfNotNull(new ValidationFailure("BaseUrl", "Lidarr URL is invalid, Prowlarr cannot connect to Lidarr - are you missing a URL base?"));
break;
default:
Expand Down
8 changes: 4 additions & 4 deletions src/NzbDrone.Core/Applications/Lidarr/LidarrV1Proxy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -141,22 +141,22 @@ private LidarrIndexer ExecuteIndexerRequest(HttpRequest request)
switch (ex.Response.StatusCode)
{
case HttpStatusCode.Unauthorized:
_logger.Error(ex, "API Key is invalid");
_logger.Warn(ex, "API Key is invalid");
break;
case HttpStatusCode.BadRequest:
if (ex.Response.Content.Contains("Query successful, but no results in the configured categories were returned from your indexer.", StringComparison.InvariantCultureIgnoreCase))
{
_logger.Error(ex, "No Results in configured categories. See FAQ Entry: Prowlarr will not sync X Indexer to App");
_logger.Warn(ex, "No Results in configured categories. See FAQ Entry: Prowlarr will not sync X Indexer to App");
break;
}

_logger.Error(ex, "Invalid Request");
break;
case HttpStatusCode.SeeOther:
_logger.Error(ex, "App returned redirect and is invalid. Check App URL");
_logger.Warn(ex, "App returned redirect and is invalid. Check App URL");
break;
case HttpStatusCode.NotFound:
_logger.Error(ex, "Remote indexer not found");
_logger.Warn(ex, "Remote indexer not found");
break;
default:
_logger.Error(ex, "Unexpected response status code: {0}", ex.Response.StatusCode);
Expand Down
6 changes: 3 additions & 3 deletions src/NzbDrone.Core/Applications/Radarr/Radarr.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ public override ValidationResult Test()
switch (ex.Response.StatusCode)
{
case HttpStatusCode.Unauthorized:
_logger.Error(ex, "API Key is invalid");
_logger.Warn(ex, "API Key is invalid");
failures.AddIfNotNull(new ValidationFailure("ApiKey", "API Key is invalid"));
break;
case HttpStatusCode.BadRequest:
_logger.Error(ex, "Prowlarr URL is invalid");
_logger.Warn(ex, "Prowlarr URL is invalid");
failures.AddIfNotNull(new ValidationFailure("ProwlarrUrl", "Prowlarr URL is invalid, Radarr cannot connect to Prowlarr"));
break;
case HttpStatusCode.SeeOther:
_logger.Error(ex, "Radarr returned redirect and is invalid");
_logger.Warn(ex, "Radarr returned redirect and is invalid");
failures.AddIfNotNull(new ValidationFailure("BaseUrl", "Radarr URL is invalid, Prowlarr cannot connect to Radarr - are you missing a URL base?"));
break;
default:
Expand Down
8 changes: 4 additions & 4 deletions src/NzbDrone.Core/Applications/Radarr/RadarrV3Proxy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -154,22 +154,22 @@ private RadarrIndexer ExecuteIndexerRequest(HttpRequest request)
switch (ex.Response.StatusCode)
{
case HttpStatusCode.Unauthorized:
_logger.Error(ex, "API Key is invalid");
_logger.Warn(ex, "API Key is invalid");
break;
case HttpStatusCode.BadRequest:
if (ex.Response.Content.Contains("Query successful, but no results in the configured categories were returned from your indexer.", StringComparison.InvariantCultureIgnoreCase))
{
_logger.Error(ex, "No Results in configured categories. See FAQ Entry: Prowlarr will not sync X Indexer to App");
_logger.Warn(ex, "No Results in configured categories. See FAQ Entry: Prowlarr will not sync X Indexer to App");
break;
}

_logger.Error(ex, "Invalid Request");
break;
case HttpStatusCode.SeeOther:
_logger.Error(ex, "App returned redirect and is invalid. Check App URL");
_logger.Warn(ex, "App returned redirect and is invalid. Check App URL");
break;
case HttpStatusCode.NotFound:
_logger.Error(ex, "Remote indexer not found");
_logger.Warn(ex, "Remote indexer not found");
break;
default:
_logger.Error(ex, "Unexpected response status code: {0}", ex.Response.StatusCode);
Expand Down
6 changes: 3 additions & 3 deletions src/NzbDrone.Core/Applications/Readarr/Readarr.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ public override ValidationResult Test()
switch (ex.Response.StatusCode)
{
case HttpStatusCode.Unauthorized:
_logger.Error(ex, "API Key is invalid");
_logger.Warn(ex, "API Key is invalid");
failures.AddIfNotNull(new ValidationFailure("ApiKey", "API Key is invalid"));
break;
case HttpStatusCode.BadRequest:
_logger.Error(ex, "Prowlarr URL is invalid");
_logger.Warn(ex, "Prowlarr URL is invalid");
failures.AddIfNotNull(new ValidationFailure("ProwlarrUrl", "Prowlarr URL is invalid, Readarr cannot connect to Prowlarr"));
break;
case HttpStatusCode.SeeOther:
_logger.Error(ex, "Readarr returned redirect and is invalid");
_logger.Warn(ex, "Readarr returned redirect and is invalid");
failures.AddIfNotNull(new ValidationFailure("BaseUrl", "Readarr URL is invalid, Prowlarr cannot connect to Readarr - are you missing a URL base?"));
break;
default:
Expand Down
8 changes: 4 additions & 4 deletions src/NzbDrone.Core/Applications/Readarr/ReadarrV1Proxy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -128,22 +128,22 @@ private ReadarrIndexer ExecuteIndexerRequest(HttpRequest request)
switch (ex.Response.StatusCode)
{
case HttpStatusCode.Unauthorized:
_logger.Error(ex, "API Key is invalid");
_logger.Warn(ex, "API Key is invalid");
break;
case HttpStatusCode.BadRequest:
if (ex.Response.Content.Contains("Query successful, but no results in the configured categories were returned from your indexer.", StringComparison.InvariantCultureIgnoreCase))
{
_logger.Error(ex, "No Results in configured categories. See FAQ Entry: Prowlarr will not sync X Indexer to App");
_logger.Warn(ex, "No Results in configured categories. See FAQ Entry: Prowlarr will not sync X Indexer to App");
break;
}

_logger.Error(ex, "Invalid Request");
break;
case HttpStatusCode.SeeOther:
_logger.Error(ex, "App returned redirect and is invalid. Check App URL");
_logger.Warn(ex, "App returned redirect and is invalid. Check App URL");
break;
case HttpStatusCode.NotFound:
_logger.Error(ex, "Remote indexer not found");
_logger.Warn(ex, "Remote indexer not found");
break;
default:
_logger.Error(ex, "Unexpected response status code: {0}", ex.Response.StatusCode);
Expand Down
6 changes: 3 additions & 3 deletions src/NzbDrone.Core/Applications/Sonarr/Sonarr.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ public override ValidationResult Test()
switch (ex.Response.StatusCode)
{
case HttpStatusCode.Unauthorized:
_logger.Error(ex, "API Key is invalid");
_logger.Warn(ex, "API Key is invalid");
failures.AddIfNotNull(new ValidationFailure("ApiKey", "API Key is invalid"));
break;
case HttpStatusCode.BadRequest:
_logger.Error(ex, "Prowlarr URL is invalid");
_logger.Warn(ex, "Prowlarr URL is invalid");
failures.AddIfNotNull(new ValidationFailure("ProwlarrUrl", "Prowlarr URL is invalid, Sonarr cannot connect to Prowlarr"));
break;
case HttpStatusCode.SeeOther:
_logger.Error(ex, "Sonarr returned redirect and is invalid");
_logger.Warn(ex, "Sonarr returned redirect and is invalid");
failures.AddIfNotNull(new ValidationFailure("BaseUrl", "Sonarr URL is invalid, Prowlarr cannot connect to Sonarr - are you missing a URL base?"));
break;
case HttpStatusCode.NotFound:
Expand Down
8 changes: 4 additions & 4 deletions src/NzbDrone.Core/Applications/Sonarr/SonarrV3Proxy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -141,22 +141,22 @@ private SonarrIndexer ExecuteIndexerRequest(HttpRequest request)
switch (ex.Response.StatusCode)
{
case HttpStatusCode.Unauthorized:
_logger.Error(ex, "API Key is invalid");
_logger.Warn(ex, "API Key is invalid");
break;
case HttpStatusCode.BadRequest:
if (ex.Response.Content.Contains("Query successful, but no results in the configured categories were returned from your indexer.", StringComparison.InvariantCultureIgnoreCase))
{
_logger.Error(ex, "No Results in configured categories. See FAQ Entry: Prowlarr will not sync X Indexer to App");
_logger.Warn(ex, "No Results in configured categories. See FAQ Entry: Prowlarr will not sync X Indexer to App");
break;
}

_logger.Error(ex, "Invalid Request");
break;
case HttpStatusCode.SeeOther:
_logger.Error(ex, "App returned redirect and is invalid. Check App URL");
_logger.Warn(ex, "App returned redirect and is invalid. Check App URL");
break;
case HttpStatusCode.NotFound:
_logger.Error(ex, "Remote indexer not found");
_logger.Warn(ex, "Remote indexer not found");
break;
default:
_logger.Error(ex, "Unexpected response status code: {0}", ex.Response.StatusCode);
Expand Down
6 changes: 3 additions & 3 deletions src/NzbDrone.Core/Applications/Whisparr/Whisparr.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ public override ValidationResult Test()
switch (ex.Response.StatusCode)
{
case HttpStatusCode.Unauthorized:
_logger.Error(ex, "API Key is invalid");
_logger.Warn(ex, "API Key is invalid");
failures.AddIfNotNull(new ValidationFailure("ApiKey", "API Key is invalid"));
break;
case HttpStatusCode.BadRequest:
_logger.Error(ex, "Prowlarr URL is invalid");
_logger.Warn(ex, "Prowlarr URL is invalid");
failures.AddIfNotNull(new ValidationFailure("ProwlarrUrl", "Prowlarr URL is invalid, Whisparr cannot connect to Prowlarr"));
break;
case HttpStatusCode.SeeOther:
_logger.Error(ex, "Whisparr returned redirect and is invalid");
_logger.Warn(ex, "Whisparr returned redirect and is invalid");
failures.AddIfNotNull(new ValidationFailure("BaseUrl", "Whisparr URL is invalid, Prowlarr cannot connect to Whisparr - are you missing a URL base?"));
break;
default:
Expand Down
8 changes: 4 additions & 4 deletions src/NzbDrone.Core/Applications/Whisparr/WhisparrV3Proxy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -126,22 +126,22 @@ private WhisparrIndexer ExecuteIndexerRequest(HttpRequest request)
switch (ex.Response.StatusCode)
{
case HttpStatusCode.Unauthorized:
_logger.Error(ex, "API Key is invalid");
_logger.Warn(ex, "API Key is invalid");
break;
case HttpStatusCode.BadRequest:
if (ex.Response.Content.Contains("Query successful, but no results in the configured categories were returned from your indexer.", StringComparison.InvariantCultureIgnoreCase))
{
_logger.Error(ex, "No Results in configured categories. See FAQ Entry: Prowlarr will not sync X Indexer to App");
_logger.Warn(ex, "No Results in configured categories. See FAQ Entry: Prowlarr will not sync X Indexer to App");
break;
}

_logger.Error(ex, "Invalid Request");
break;
case HttpStatusCode.SeeOther:
_logger.Error(ex, "App returned redirect and is invalid. Check App URL");
_logger.Warn(ex, "App returned redirect and is invalid. Check App URL");
break;
case HttpStatusCode.NotFound:
_logger.Error(ex, "Remote indexer not found");
_logger.Warn(ex, "Remote indexer not found");
break;
default:
_logger.Error(ex, "Unexpected response status code: {0}", ex.Response.StatusCode);
Expand Down

0 comments on commit 3ce3f8a

Please sign in to comment.