mirror of
https://github.com/Radarr/Radarr
synced 2025-02-25 07:32:56 +00:00
Pull Sonarr commit 'Log Skyhook connection failures with more info.' (#6060)
* Log Skyhook connection failures with more info. (cherry picked from commit 6672650b6b5e152e82fb3ad38a0a158d66c0b83d) * Log Skyhook connection failures with more info. (cherry picked from commit f57cf1561beb7ee4a1b3afcdf391488fc7c04d02) Co-authored-by: Taloth Saldono <Taloth@users.noreply.github.com>
This commit is contained in:
parent
176bf7ce32
commit
8eb0f33718
3 changed files with 25 additions and 6 deletions
|
@ -1,4 +1,5 @@
|
||||||
using System.Net;
|
using System;
|
||||||
|
using System.Net;
|
||||||
using NzbDrone.Common.Exceptions;
|
using NzbDrone.Common.Exceptions;
|
||||||
|
|
||||||
namespace NzbDrone.Core.Exceptions
|
namespace NzbDrone.Core.Exceptions
|
||||||
|
@ -13,6 +14,12 @@ public NzbDroneClientException(HttpStatusCode statusCode, string message, params
|
||||||
StatusCode = statusCode;
|
StatusCode = statusCode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public NzbDroneClientException(HttpStatusCode statusCode, string message, Exception innerException, params object[] args)
|
||||||
|
: base(message, innerException, args)
|
||||||
|
{
|
||||||
|
StatusCode = statusCode;
|
||||||
|
}
|
||||||
|
|
||||||
public NzbDroneClientException(HttpStatusCode statusCode, string message)
|
public NzbDroneClientException(HttpStatusCode statusCode, string message)
|
||||||
: base(message)
|
: base(message)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
using System.Net;
|
using System;
|
||||||
|
using System.Net;
|
||||||
using NzbDrone.Core.Exceptions;
|
using NzbDrone.Core.Exceptions;
|
||||||
|
|
||||||
namespace NzbDrone.Core.MetadataSource.SkyHook
|
namespace NzbDrone.Core.MetadataSource.SkyHook
|
||||||
|
@ -14,5 +15,10 @@ public SkyHookException(string message, params object[] args)
|
||||||
: base(HttpStatusCode.ServiceUnavailable, message, args)
|
: base(HttpStatusCode.ServiceUnavailable, message, args)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public SkyHookException(string message, Exception innerException, params object[] args)
|
||||||
|
: base(HttpStatusCode.ServiceUnavailable, message, innerException, args)
|
||||||
|
{
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -421,14 +421,20 @@ public List<Movie> SearchForNewMovie(string title)
|
||||||
|
|
||||||
return httpResponse.Resource.SelectList(MapSearchResult);
|
return httpResponse.Resource.SelectList(MapSearchResult);
|
||||||
}
|
}
|
||||||
catch (HttpException)
|
catch (HttpException ex)
|
||||||
{
|
{
|
||||||
throw new SkyHookException("Search for '{0}' failed. Unable to communicate with TMDb.", title);
|
_logger.Warn(ex);
|
||||||
|
throw new SkyHookException("Search for '{0}' failed. Unable to communicate with TMDb.", ex, title);
|
||||||
|
}
|
||||||
|
catch (WebException ex)
|
||||||
|
{
|
||||||
|
_logger.Warn(ex);
|
||||||
|
throw new SkyHookException("Search for '{0}' failed. Unable to communicate with TMDb.", ex, title, ex.Message);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
_logger.Warn(ex, ex.Message);
|
_logger.Warn(ex);
|
||||||
throw new SkyHookException("Search for '{0}' failed. Invalid response received from TMDb.", title);
|
throw new SkyHookException("Search for '{0}' failed. Invalid response received from TMDb.", ex, title);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue