From a5e54a6d6ea6af27d5a6ab79a7d008756343cef9 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 | 3 +++ src/NzbDrone.Core/Instrumentation/ReconfigureLogging.cs | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs b/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs index 477f356414..0e9f7c85bf 100644 --- a/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs +++ b/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs @@ -47,6 +47,7 @@ public interface IConfigFileProvider : IHandleAsync, string UpdateScriptPath { get; } string SyslogServer { get; } int SyslogPort { get; } + string SyslogLevel { get; } } public class ConfigFileProvider : IConfigFileProvider @@ -216,6 +217,8 @@ public string UrlBase public int SyslogPort => GetValueInt("SyslogPort", 514, persist: false); + public string SyslogLevel => GetValue("SyslogLevel", LogLevel, false).ToLowerInvariant(); + public int GetValueInt(string key, int defaultValue, bool persist = true) { return Convert.ToInt32(GetValue(key, defaultValue, persist)); diff --git a/src/NzbDrone.Core/Instrumentation/ReconfigureLogging.cs b/src/NzbDrone.Core/Instrumentation/ReconfigureLogging.cs index 6e13f38119..ee7d2f0726 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);