From 1e89a1a3cb8fa83e4415b047513cbecacbebc59c Mon Sep 17 00:00:00 2001 From: Bogdan Date: Thu, 10 Oct 2024 21:15:27 +0300 Subject: [PATCH] Include exception message in SkyHook failure message --- frontend/src/AddSeries/AddNewSeries/AddNewSeries.js | 4 +++- src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/frontend/src/AddSeries/AddNewSeries/AddNewSeries.js b/frontend/src/AddSeries/AddNewSeries/AddNewSeries.js index 331d4849e..18cbffddb 100644 --- a/frontend/src/AddSeries/AddNewSeries/AddNewSeries.js +++ b/frontend/src/AddSeries/AddNewSeries/AddNewSeries.js @@ -1,5 +1,6 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; +import Alert from 'Components/Alert'; import TextInput from 'Components/Form/TextInput'; import Icon from 'Components/Icon'; import Button from 'Components/Link/Button'; @@ -129,7 +130,8 @@ class AddNewSeries extends Component {
{translate('AddNewSeriesError')}
-
{getErrorMessage(error)}
+ + {getErrorMessage(error)} : null } diff --git a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs index c6656816d..f600057a7 100644 --- a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs +++ b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs @@ -147,17 +147,17 @@ namespace NzbDrone.Core.MetadataSource.SkyHook catch (HttpException ex) { _logger.Warn(ex); - throw new SkyHookException("Search for '{0}' failed. Unable to communicate with SkyHook.", ex, title); + throw new SkyHookException("Search for '{0}' failed. Unable to communicate with SkyHook. {1}", ex, title, ex.Message); } catch (WebException ex) { _logger.Warn(ex); - throw new SkyHookException("Search for '{0}' failed. Unable to communicate with SkyHook.", ex, title, ex.Message); + throw new SkyHookException("Search for '{0}' failed. Unable to communicate with SkyHook. {1}", ex, title, ex.Message); } catch (Exception ex) { _logger.Warn(ex); - throw new SkyHookException("Search for '{0}' failed. Invalid response received from SkyHook.", ex, title); + throw new SkyHookException("Search for '{0}' failed. Invalid response received from SkyHook. {1}", ex, title, ex.Message); } }