Skip to content

Commit

Permalink
New: Instance Name used for Syslog
Browse files Browse the repository at this point in the history
  • Loading branch information
RobinDadswell authored and Qstick committed May 14, 2022
1 parent 9d5d92b commit fc55aa4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,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)
{
Expand Down
5 changes: 3 additions & 2 deletions src/NzbDrone.Core/Instrumentation/ReconfigureLogging.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 = "Prowlarr";
syslogTarget.MessageCreation.Rfc5424.AppName = _configFileProvider.InstanceName;

var loggingRule = new LoggingRule("*", minimumLogLevel, syslogTarget);

Expand Down

0 comments on commit fc55aa4

Please sign in to comment.