From d1df5ed7cd3740d9619de1836ac34356a8fb8994 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Wed, 11 Feb 2015 17:05:27 -0800 Subject: [PATCH] New: Logging level in settings will be used for Console logging --- src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs | 5 ----- src/NzbDrone.Core/Instrumentation/ReconfigureLogging.cs | 9 +++++++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs b/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs index 6a7942201..c352a9f17 100644 --- a/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs +++ b/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs @@ -88,11 +88,6 @@ namespace NzbDrone.Common.Instrumentation { var level = LogLevel.Trace; - if (RuntimeInfoBase.IsProduction) - { - level = LogLevel.Info; - } - var coloredConsoleTarget = new ColoredConsoleTarget(); coloredConsoleTarget.Name = "consoleLogger"; diff --git a/src/NzbDrone.Core/Instrumentation/ReconfigureLogging.cs b/src/NzbDrone.Core/Instrumentation/ReconfigureLogging.cs index 1d73928b9..794c45dbd 100644 --- a/src/NzbDrone.Core/Instrumentation/ReconfigureLogging.cs +++ b/src/NzbDrone.Core/Instrumentation/ReconfigureLogging.cs @@ -2,6 +2,7 @@ using System.Linq; using NLog; using NLog.Config; +using NLog.Targets; using NzbDrone.Common.Instrumentation; using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration.Events; @@ -25,6 +26,14 @@ namespace NzbDrone.Core.Instrumentation var minimumLogLevel = LogLevel.FromString(_configFileProvider.LogLevel); var rules = LogManager.Configuration.LoggingRules; + + //Console + var consoleLoggerRule = rules.Single(s => s.Targets.Any(t => t is ColoredConsoleTarget)); + consoleLoggerRule.EnableLoggingForLevel(LogLevel.Trace); + + SetMinimumLogLevel(consoleLoggerRule, minimumLogLevel); + + //Log Files var rollingFileLoggerRule = rules.Single(s => s.Targets.Any(t => t is NzbDroneFileTarget)); rollingFileLoggerRule.EnableLoggingForLevel(LogLevel.Trace);