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

Fixed failing ConfigFileProvider tests due to ConsoleLogLevel property error.

This commit is contained in:
Taloth Saldono 2019-01-21 22:28:45 +01:00
parent b1a8c70d20
commit 86c74b3ee0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -180,7 +180,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", null, persist: false); public string ConsoleLogLevel => GetValue("ConsoleLogLevel", string.Empty, persist: false);
public string SslCertHash => GetValue("SslCertHash", ""); public string SslCertHash => GetValue("SslCertHash", "");

3
src/NzbDrone.Core/Instrumentation/ReconfigureLogging.cs
View File

@ -2,6 +2,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using NLog; using NLog;
using NLog.Config; using NLog.Config;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration;
using NzbDrone.Core.Configuration.Events; using NzbDrone.Core.Configuration.Events;
using NzbDrone.Core.Messaging.Events; using NzbDrone.Core.Messaging.Events;
@ -22,7 +23,7 @@ namespace NzbDrone.Core.Instrumentation
var minimumLogLevel = LogLevel.FromString(_configFileProvider.LogLevel); var minimumLogLevel = LogLevel.FromString(_configFileProvider.LogLevel);
LogLevel minimumConsoleLogLevel; LogLevel minimumConsoleLogLevel;
if (_configFileProvider.ConsoleLogLevel != null) if (_configFileProvider.ConsoleLogLevel.IsNotNullOrWhiteSpace())
minimumConsoleLogLevel = LogLevel.FromString(_configFileProvider.ConsoleLogLevel); minimumConsoleLogLevel = LogLevel.FromString(_configFileProvider.ConsoleLogLevel);
else if (minimumLogLevel > LogLevel.Info) else if (minimumLogLevel > LogLevel.Info)
minimumConsoleLogLevel = minimumLogLevel; minimumConsoleLogLevel = minimumLogLevel;