Skip to content
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

Jump to bottom

Implement IRawValue on ${whenEmpty} #3395

Closed
wants to merge 1 commit into from
Closed

Implement IRawValue on ${whenEmpty} #3395

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 19 additions & 1 deletion src/NLog/LayoutRenderers/Wrappers/WhenEmptyLayoutRendererWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//

using NLog.Internal;

namespace NLog.LayoutRenderers.Wrappers
{
using System;
Expand All @@ -46,7 +48,7 @@ namespace NLog.LayoutRenderers.Wrappers
[AppDomainFixedOutput]
[ThreadAgnostic]
[ThreadSafe]
public sealed class WhenEmptyLayoutRendererWrapper : WrapperLayoutRendererBuilderBase
public sealed class WhenEmptyLayoutRendererWrapper : WrapperLayoutRendererBuilderBase, IRawValue
{
/// <summary>
/// Gets or sets the layout to be rendered when original layout produced empty result.
Expand Down Expand Up @@ -78,5 +80,21 @@ protected override void RenderInnerAndTransform(LogEventInfo logEvent, StringBui
protected override void TransformFormattedMesssage(StringBuilder target)
{
}

#region Implementation of IRawValue

/// <inheritdoc />
public bool TryGetRawValue(LogEventInfo logEvent, out object value)
{
var item = Inner.Render(logEvent);
if (item.Length > 0)
{
return Inner.TryGetRawValue(logEvent, out value);
}

return WhenEmpty.TryGetRawValue(logEvent, out value);
}

#endregion
}
}
24 changes: 24 additions & 0 deletions tests/NLog.UnitTests/LayoutRenderers/Wrappers/WhenEmptyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//

using System;

namespace NLog.UnitTests.LayoutRenderers.Wrappers
{
using NLog;
Expand Down Expand Up @@ -73,5 +75,27 @@ public void WhenEmpty_MissingInner_ShouldNotThrow()
var le = LogEventInfo.Create(LogLevel.Info, "logger", "message");
Assert.Equal("api.log", l.Render(le));
}


[Fact]
public void WhenDbNullRawValueShouldWork()
{
SimpleLayout l = @"${event-properties:prop1:whenEmpty=${db-null}}";
{
var le = LogEventInfo.Create(LogLevel.Info, "logger", "message");
le.Properties["prop1"] = 1;
var success = l.TryGetRawValue(le, out var rawValue);
Assert.True(success);
Assert.Equal(1, rawValue);
}
// empty log message
{
var le = LogEventInfo.Create(LogLevel.Info, "logger", "message");
var success = l.TryGetRawValue(le, out var rawValue);
Assert.True(success);
Assert.Equal(DBNull.Value, rawValue);
}

}
}
}