Fixed: Show more information in UI when testing SAB fails in some cases

pull/2/head
Mark McDowall 4 years ago committed by Qstick
parent 2a1ebe54b3
commit da1210c6a6

@ -207,7 +207,7 @@ function FormInputGroup(props) {
key={index}
text={error.message}
link={error.link}
linkTooltip={error.detailedMessage}
tooltip={error.detailedMessage}
isError={true}
isCheckInput={checkInput}
/>
@ -222,7 +222,7 @@ function FormInputGroup(props) {
key={index}
text={warning.message}
link={warning.link}
linkTooltip={warning.detailedMessage}
tooltip={warning.detailedMessage}
isWarning={true}
isCheckInput={checkInput}
/>

@ -37,3 +37,7 @@
margin-left: 5px;
}
.details {
margin-left: 5px;
}

@ -11,7 +11,7 @@ function FormInputHelpText(props) {
className,
text,
link,
linkTooltip,
tooltip,
isError,
isWarning,
isCheckInput
@ -28,16 +28,27 @@ function FormInputHelpText(props) {
{text}
{
!!link &&
link ?
<Link
className={styles.link}
to={link}
title={linkTooltip}
title={tooltip}
>
<Icon
name={icons.EXTERNAL_LINK}
/>
</Link>
</Link> :
null
}
{
!link && tooltip ?
<Icon
containerClassName={styles.details}
name={icons.INFO}
title={tooltip}
/> :
null
}
</div>
);
@ -47,7 +58,7 @@ FormInputHelpText.propTypes = {
className: PropTypes.string.isRequired,
text: PropTypes.string.isRequired,
link: PropTypes.string,
linkTooltip: PropTypes.string,
tooltip: PropTypes.string,
isError: PropTypes.bool,
isWarning: PropTypes.bool,
isCheckInput: PropTypes.bool

@ -378,7 +378,10 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
catch (Exception ex)
{
_logger.Error(ex, ex.Message);
return new ValidationFailure("Host", "Unable to connect to SABnzbd");
return new NzbDroneValidationFailure("Host", "Unable to connect to SABnzbd")
{
DetailedDescription = ex.Message
};
}
}

@ -186,11 +186,16 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
}
catch (HttpException ex)
{
throw new DownloadClientException("Unable to connect to SABnzbd, please check your settings", ex);
throw new DownloadClientException("Unable to connect to SABnzbd, {0}", ex, ex.Message);
}
catch (WebException ex)
{
throw new DownloadClientUnavailableException("Unable to connect to SABnzbd, please check your settings", ex);
if (ex.Status == WebExceptionStatus.TrustFailure)
{
throw new DownloadClientUnavailableException("Unable to connect to SABnzbd, certificate validation failed.", ex);
}
throw new DownloadClientUnavailableException("Unable to connect to SABnzbd, {0}", ex, ex.Message);
}
CheckForError(response);

Loading…
Cancel
Save