Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/NLog.Web.AspNetCore/Internal/AssemblyExtensionTypes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ public static void RegisterTypes(this NLog.Config.ISetupExtensionsBuilder setupB
setupBuilder.RegisterLayoutRenderer<NLog.Web.LayoutRenderers.AspNetRequestServerVariableLayoutRenderer>("aspnet-request-servervariable");
setupBuilder.RegisterLayoutRenderer<NLog.Web.LayoutRenderers.AspNetRequestEndPointLayoutRenderer>("aspnet-request-endpoint");
setupBuilder.RegisterLayoutRenderer<NLog.Web.LayoutRenderers.AspNetRequestEndPointGroupLayoutRenderer>("aspnet-request-endpoint-group");
setupBuilder.RegisterLayoutRenderer<NLog.Web.LayoutRenderers.AspNetRequestEndPointNameLayoutRenderer>("aspnet-request-endpoint-name");
#endif

#pragma warning restore CS0618 // Type or member is obsolete
Expand Down
1 change: 1 addition & 0 deletions src/NLog.Web.AspNetCore/Internal/AssemblyExtensionTypes.tt
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ namespace NLog.Web.Internal
setupBuilder.RegisterLayoutRenderer<NLog.Web.LayoutRenderers.AspNetRequestServerVariableLayoutRenderer>("aspnet-request-servervariable");
setupBuilder.RegisterLayoutRenderer<NLog.Web.LayoutRenderers.AspNetRequestEndPointLayoutRenderer>("aspnet-request-endpoint");
setupBuilder.RegisterLayoutRenderer<NLog.Web.LayoutRenderers.AspNetRequestEndPointGroupLayoutRenderer>("aspnet-request-endpoint-group");
setupBuilder.RegisterLayoutRenderer<NLog.Web.LayoutRenderers.AspNetRequestEndPointNameLayoutRenderer>("aspnet-request-endpoint-name");
#endif

#pragma warning restore CS0618 // Type or member is obsolete
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#if NETCOREAPP3_0_OR_GREATER

using System;
using System.Text;
using NLog.LayoutRenderers;
using NLog.Web.Internal;

namespace NLog.Web.LayoutRenderers
{
/// <summary>
/// ASP.NET request EndPoint Name. Metadata-attribute assigned by WithName or [EndpointName]
/// </summary>
/// <remarks>
/// <code>${aspnet-request-endpoint-name}</code>
/// </remarks>
/// <seealso href="https://github.com/NLog/NLog/wiki/AspNet-Request-EndPoint-Name-Layout-Renderer">Documentation on NLog Wiki</seealso>
[LayoutRenderer("aspnet-request-endpoint-name")]
public class AspNetRequestEndPointNameLayoutRenderer : AspNetLayoutRendererBase
{
/// <inheritdoc/>
protected override void Append(StringBuilder builder, LogEventInfo logEvent)
{
var endPoint = HttpContextAccessor?.HttpContext.TryGetFeature<Microsoft.AspNetCore.Http.Features.IEndpointFeature>()?.Endpoint;
var endPointGroup = endPoint?.Metadata.GetMetadata<Microsoft.AspNetCore.Routing.EndpointNameMetadata>();
builder.Append(endPointGroup?.EndpointName);
}
}
}

#endif
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
#if NETCOREAPP3_0_OR_GREATER
using NLog.Web.LayoutRenderers;
using Microsoft.AspNetCore.Connections.Features;
using Microsoft.AspNetCore.Http.Features;
using NSubstitute;
using Xunit;

namespace NLog.Web.Tests.LayoutRenderers
{
public class AspNetRequestEndPointNameLayoutRendererTests : LayoutRenderersTestBase<AspNetRequestEndPointNameLayoutRenderer>
{
[Fact]
public void SuccessTest()
{
// Arrange
var (renderer, httpContext) = CreateWithHttpContext();
var endPointFeature = Substitute.For<IEndpointFeature>();
var endPointMetaData = new Microsoft.AspNetCore.Http.EndpointMetadataCollection(new Microsoft.AspNetCore.Routing.EndpointNameMetadata("42"));
endPointFeature.Endpoint.Returns(new Microsoft.AspNetCore.Http.Endpoint(null, endPointMetaData, "DisplayName"));

var featureCollection = new FeatureCollection();
featureCollection.Set<IEndpointFeature>(endPointFeature);

httpContext.Features.Returns(featureCollection);
// Act
var result = renderer.Render(new LogEventInfo());
// Assert
Assert.Equal("42", result);
}

[Fact]
public void NullTest()
{
// Arrange
var (renderer, httpContext) = CreateWithHttpContext();
httpContext.Features.Returns(new FeatureCollection());
// Act
var result = renderer.Render(new LogEventInfo());
// Assert
Assert.Equal(string.Empty, result);
}
}
}
#endif