Skip to content

SyslogLayout - Use Rfc5424 by default, so StructuredDataParams works out of the box #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
snakefoot wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −12
Open

SyslogLayout - Use Rfc5424 by default, so StructuredDataParams works out of the box #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/NLog.Targets.Network/Layouts/SyslogLayout.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,13 +255,13 @@ protected override void RenderFormattedMessage(LogEventInfo logEvent, StringBuil
var appName = _appNameString ?? EscapePropertyName(SyslogAppName?.Render(logEvent) ?? string.Empty, AppNameMaxLength);
var processId = _processIdString ?? EscapePropertyName(SyslogProcessId?.Render(logEvent) ?? string.Empty, ProcessIdMaxLength);

if (Rfc3164 || !Rfc5424)
if (Rfc5424 || !Rfc3164)
{
Render_Rfc3164(logEvent, target, priValue, hostName, appName, processId);
Render_Rfc5424(logEvent, target, priValue, hostName, appName, processId);
}
else
{
Render_Rfc5424(logEvent, target, priValue, hostName, appName, processId);
Render_Rfc3164(logEvent, target, priValue, hostName, appName, processId);
}
}

Expand Down
18 changes: 9 additions & 9 deletions tests/NLog.Targets.Network.Tests/SyslogLayoutTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public SyslogLayoutTests()
[Fact]
public void SyslogLayout_Rfc3164()
{
var memTarget = new NLog.Targets.MemoryTarget() { Layout = new SyslogLayout() };
var memTarget = new NLog.Targets.MemoryTarget() { Layout = new SyslogLayout() { Rfc3164 = true } };
using (var logFactory = new LogFactory().Setup().LoadConfiguration(cfg => cfg.ForLogger().WriteTo(memTarget)).LogFactory)
{
var logger = logFactory.GetCurrentClassLogger();
Expand All @@ -73,7 +73,7 @@ public void SyslogLayout_Rfc3164()
[Fact]
public void SyslogLayout_Rfc3164_Newline()
{
var memTarget = new NLog.Targets.MemoryTarget() { Layout = new SyslogLayout() };
var memTarget = new NLog.Targets.MemoryTarget() { Layout = new SyslogLayout() { Rfc3164 = true } };
using (var logFactory = new LogFactory().Setup().LoadConfiguration(cfg => cfg.ForLogger().WriteTo(memTarget)).LogFactory)
{
var logger = logFactory.GetCurrentClassLogger();
Expand All @@ -97,7 +97,7 @@ public void SyslogLayout_Rfc3164_Newline()
[InlineData("Fatal", "<136>")]
public void SyslogLayout_Rfc3164_LogLevels(string logLevel, string priValue)
{
var memTarget = new NLog.Targets.MemoryTarget() { Layout = new SyslogLayout() { SyslogFacility = SyslogFacility.Local1 } };
var memTarget = new NLog.Targets.MemoryTarget() { Layout = new SyslogLayout() { Rfc3164 = true, SyslogFacility = SyslogFacility.Local1 } };
using (var logFactory = new LogFactory().Setup().LoadConfiguration(cfg => cfg.ForLogger().WriteTo(memTarget)).LogFactory)
{
var logger = logFactory.GetCurrentClassLogger();
Expand All @@ -115,7 +115,7 @@ public void SyslogLayout_Rfc3164_LogLevels(string logLevel, string priValue)
[Fact]
public void SyslogLayout_Rfc3164_EscapeNames()
{
var memTarget = new NLog.Targets.MemoryTarget() { Layout = new SyslogLayout() { SyslogHostName = " Hello World ", SyslogAppName = " Destroy World ", SyslogProcessId = " Goodbye World " } };
var memTarget = new NLog.Targets.MemoryTarget() { Layout = new SyslogLayout() { Rfc3164 = true, SyslogHostName = " Hello World ", SyslogAppName = " Destroy World ", SyslogProcessId = " Goodbye World " } };
using (var logFactory = new LogFactory().Setup().LoadConfiguration(cfg => cfg.ForLogger().WriteTo(memTarget)).LogFactory)
{
var logger = logFactory.GetCurrentClassLogger();
Expand All @@ -133,7 +133,7 @@ public void SyslogLayout_Rfc3164_EscapeNames()
[Fact]
public void SyslogLayout_Rfc5424()
{
var memTarget = new NLog.Targets.MemoryTarget() { Layout = new SyslogLayout() { Rfc5424 = true } };
var memTarget = new NLog.Targets.MemoryTarget() { Layout = new SyslogLayout() };
using (var logFactory = new LogFactory().Setup().LoadConfiguration(cfg => cfg.ForLogger().WriteTo(memTarget)).LogFactory)
{
var logger = logFactory.GetCurrentClassLogger();
Expand All @@ -148,7 +148,7 @@ public void SyslogLayout_Rfc5424()
[Fact]
public void SyslogLayout_Rfc5424_Newline()
{
var memTarget = new NLog.Targets.MemoryTarget() { Layout = new SyslogLayout() { Rfc5424 = true } };
var memTarget = new NLog.Targets.MemoryTarget() { Layout = new SyslogLayout() };
using (var logFactory = new LogFactory().Setup().LoadConfiguration(cfg => cfg.ForLogger().WriteTo(memTarget)).LogFactory)
{
var logger = logFactory.GetCurrentClassLogger();
Expand All @@ -169,7 +169,7 @@ public void SyslogLayout_Rfc5424_Newline()
[InlineData("Fatal", "<136>")]
public void SyslogLayout_Rfc5424_LogLevels(string logLevel, string priValue)
{
var memTarget = new NLog.Targets.MemoryTarget() { Layout = new SyslogLayout() { Rfc5424 = true, SyslogFacility = SyslogFacility.Local1 } };
var memTarget = new NLog.Targets.MemoryTarget() { Layout = new SyslogLayout() { SyslogFacility = SyslogFacility.Local1 } };
using (var logFactory = new LogFactory().Setup().LoadConfiguration(cfg => cfg.ForLogger().WriteTo(memTarget)).LogFactory)
{
var logger = logFactory.GetCurrentClassLogger();
Expand All @@ -184,7 +184,7 @@ public void SyslogLayout_Rfc5424_LogLevels(string logLevel, string priValue)
[Fact]
public void SyslogLayout_Rfc5424_EscapeNames()
{
var memTarget = new NLog.Targets.MemoryTarget() { Layout = new SyslogLayout() { Rfc5424 = true } };
var memTarget = new NLog.Targets.MemoryTarget() { Layout = new SyslogLayout() };
using (var logFactory = new LogFactory().Setup().LoadConfiguration(cfg => cfg.ForLogger().WriteTo(memTarget)).LogFactory)
{
var logger = logFactory.GetCurrentClassLogger();
Expand All @@ -199,7 +199,7 @@ public void SyslogLayout_Rfc5424_EscapeNames()
[Fact]
public void SyslogLayout_Rfc5424_StructuredData()
{
var syslogLayout = new SyslogLayout() { Rfc5424 = true };
var syslogLayout = new SyslogLayout();
syslogLayout.StructuredDataParams.Add(new TargetPropertyWithContext(" ThreadId ", " ${threadid} "));
syslogLayout.IncludeEventProperties = true;

Expand Down