Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Health UI improvements 

Fixed: Failing to get items from SABnzbd will report health error properly
Fixed: Some health checks not showing test all button on System: Health
This commit is contained in:
Mark McDowall 2019-08-15 00:24:09 -07:00
parent 0d410d107d
commit 767a09894a
5 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/src/Settings/General/LoggingSettings.js
View File

@ -6,6 +6,12 @@ import FormGroup from 'Components/Form/FormGroup';
import FormLabel from 'Components/Form/FormLabel'; import FormLabel from 'Components/Form/FormLabel';
import FormInputGroup from 'Components/Form/FormInputGroup'; import FormInputGroup from 'Components/Form/FormInputGroup';
const logLevelOptions = [
{ key: 'info', value: 'Info' },
{ key: 'debug', value: 'Debug' },
{ key: 'trace', value: 'Trace' }
];
function LoggingSettings(props) { function LoggingSettings(props) {
const { const {
settings, settings,
@ -16,12 +22,6 @@ function LoggingSettings(props) {
logLevel logLevel
} = settings; } = settings;
const logLevelOptions = [
{ key: 'info', value: 'Info' },
{ key: 'debug', value: 'Debug' },
{ key: 'trace', value: 'Trace' }
];
return ( return (
<FieldSet legend="Logging"> <FieldSet legend="Logging">
<FormGroup> <FormGroup>

2
frontend/src/System/Status/Health/Health.js
View File

@ -26,6 +26,7 @@ function getInternalLink(source) {
/> />
); );
case 'DownloadClientCheck': case 'DownloadClientCheck':
case 'DownloadClientStatusCheck':
case 'ImportMechanismCheck': case 'ImportMechanismCheck':
return ( return (
<IconButton <IconButton
@ -67,6 +68,7 @@ function getTestLink(source, props) {
/> />
); );
case 'DownloadClientCheck': case 'DownloadClientCheck':
case 'DownloadClientStatusCheck':
return ( return (
<SpinnerIconButton <SpinnerIconButton
name={icons.TEST} name={icons.TEST}

2
frontend/src/System/Tasks/Queued/QueuedTaskRow.css
View File

@ -27,5 +27,5 @@
.actions { .actions {
composes: cell from '~Components/Table/Cells/TableRowCell.css'; composes: cell from '~Components/Table/Cells/TableRowCell.css';
width: 20px; width: 60px;
} }

2
src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
View File

@ -179,7 +179,7 @@ namespace NzbDrone.Core.Configuration
public string Branch => GetValue("Branch", "master").ToLowerInvariant(); public string Branch => GetValue("Branch", "master").ToLowerInvariant();
public string LogLevel => GetValue("LogLevel", "Info"); public string LogLevel => GetValue("LogLevel", "info");
public string ConsoleLogLevel => GetValue("ConsoleLogLevel", string.Empty, persist: false); public string ConsoleLogLevel => GetValue("ConsoleLogLevel", string.Empty, persist: false);
public string SslCertHash => GetValue("SslCertHash", ""); public string SslCertHash => GetValue("SslCertHash", "");

13
src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs
View File

@ -51,18 +51,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
private IEnumerable<DownloadClientItem> GetQueue() private IEnumerable<DownloadClientItem> GetQueue()
{ {
SabnzbdQueue sabQueue; var sabQueue = _proxy.GetQueue(0, 0, Settings);
try
{
sabQueue = _proxy.GetQueue(0, 0, Settings);
}
catch (DownloadClientException ex)
{
_logger.Warn(ex, "Couldn't get download queue. {0}", ex.Message);
return Enumerable.Empty<DownloadClientItem>();
}
var queueItems = new List<DownloadClientItem>(); var queueItems = new List<DownloadClientItem>();
foreach (var sabQueueItem in sabQueue.Items) foreach (var sabQueueItem in sabQueue.Items)