1
0
mirror of https://github.com/Radarr/Radarr.git synced 2024-08-18 00:09:37 +02:00

Fixed: Notifiarr - Better HTTP Error Handling

also quiet sentry
This commit is contained in:
bakerboy448 2022-07-13 12:56:13 -05:00
parent d5c524719b
commit 1db690ad39

View File

@ -54,17 +54,19 @@ public ValidationFailure Test(NotifiarrSettings settings)
_logger.Error(ex, "API key is invalid: " + ex.Message); _logger.Error(ex, "API key is invalid: " + ex.Message);
return new ValidationFailure("APIKey", "API key is invalid"); return new ValidationFailure("APIKey", "API key is invalid");
case 400: case 400:
_logger.Error(ex, "Unable to send test message. Ensure Radarr Integration is enabled & assigned a channel on Notifiarr");
return new ValidationFailure("", "Unable to send test message. Ensure Radarr Integration is enabled & assigned a channel on Notifiarr");
case 520: case 520:
case 521: case 521:
case 522: case 522:
case 523: case 523:
case 524: case 524:
_logger.Error(ex, "Unable to send test notification: " + ex.Message); _logger.Error(ex, "Cloudflare Related HTTP Error - Unable to send test message: " + ex.Message);
return new ValidationFailure("", "Unable to send test notification"); return new ValidationFailure("", "Cloudflare Related HTTP Error - Unable to send test message");
} }
_logger.Error(ex, "Unable to send test message: " + ex.Message); _logger.Error(ex, "Unknown HTTP Error - Unable to send test message: " + ex.Message);
return new ValidationFailure("APIKey", "Unable to send test notification"); return new ValidationFailure("", "Unknown HTTP Error - Unable to send test message");
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -95,19 +97,21 @@ private void ProcessNotification(StringDictionary message, NotifiarrSettings set
switch ((int)ex.Response.StatusCode) switch ((int)ex.Response.StatusCode)
{ {
case 401: case 401:
_logger.Error(ex, "API key is invalid"); _logger.Error("", "API key is invalid");
throw; throw new NotifiarrException("API key is invalid", ex);
case 400: case 400:
_logger.Error(ex, "Unable to send notification. Ensure Radarr Integration is enabled & assigned a channel on Notifiarr");
throw new NotifiarrException("Unable to send notification. Ensure Radarr Integration is enabled & assigned a channel on Notifiarr", ex);
case 520: case 520:
case 521: case 521:
case 522: case 522:
case 523: case 523:
case 524: case 524:
_logger.Error(ex, "Unable to send notification"); _logger.Error(ex, "Cloudflare Related HTTP Error - Unable to send notification");
throw; throw new NotifiarrException("Cloudflare Related HTTP Error - Unable to send notification", ex);
} }
throw new NotifiarrException("Unable to send notification", ex); throw new NotifiarrException("Unknown HTTP Error - Unable to send notification", ex);
} }
} }
} }