From 39ad315e73aec65bb955d85a1814d16018917ca4 Mon Sep 17 00:00:00 2001 From: Robin Dadswell <19610103+RobinDadswell@users.noreply.github.com> Date: Thu, 12 May 2022 17:10:27 +0100 Subject: [PATCH] New: Instance Name used for Syslog --- src/NzbDrone.Core/Configuration/ConfigFileProvider.cs | 2 +- src/NzbDrone.Core/Instrumentation/ReconfigureLogging.cs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs b/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs index a2329f999..2d4de359c 100644 --- a/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs +++ b/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs @@ -237,7 +237,7 @@ public string UrlBase public int SyslogPort => GetValueInt("SyslogPort", 514, persist: false); - public string SyslogLevel => GetValue("SyslogLevel", LogLevel).ToLowerInvariant(); + public string SyslogLevel => GetValue("SyslogLevel", LogLevel, false).ToLowerInvariant(); public int GetValueInt(string key, int defaultValue, bool persist = true) { diff --git a/src/NzbDrone.Core/Instrumentation/ReconfigureLogging.cs b/src/NzbDrone.Core/Instrumentation/ReconfigureLogging.cs index f6c3af5b2..b2f80d8d1 100644 --- a/src/NzbDrone.Core/Instrumentation/ReconfigureLogging.cs +++ b/src/NzbDrone.Core/Instrumentation/ReconfigureLogging.cs @@ -44,7 +44,8 @@ public void Reconfigure() if (_configFileProvider.SyslogServer.IsNotNullOrWhiteSpace()) { - SetSyslogParameters(_configFileProvider.SyslogServer, _configFileProvider.SyslogPort, minimumLogLevel); + var syslogLevel = LogLevel.FromString(_configFileProvider.SyslogLevel); + SetSyslogParameters(_configFileProvider.SyslogServer, _configFileProvider.SyslogPort, syslogLevel); } var rules = LogManager.Configuration.LoggingRules; @@ -118,7 +119,7 @@ private void SetSyslogParameters(string syslogServer, int syslogPort, LogLevel m syslogTarget.MessageSend.Udp.Server = syslogServer; syslogTarget.MessageSend.Udp.ReconnectInterval = 500; syslogTarget.MessageCreation.Rfc = RfcNumber.Rfc5424; - syslogTarget.MessageCreation.Rfc5424.AppName = BuildInfo.AppName; + syslogTarget.MessageCreation.Rfc5424.AppName = _configFileProvider.InstanceName; var loggingRule = new LoggingRule("*", minimumLogLevel, syslogTarget);