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

Fix AssemblyVersionLayoutRenderer on ASP.NET to work with async=true #635

Merged
merged 1 commit into from
Feb 17, 2021
Merged

Fix AssemblyVersionLayoutRenderer on ASP.NET to work with async=true #635

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
13 changes: 6 additions & 7 deletions src/Shared/LayoutRenderers/AssemblyVersionLayoutRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,17 @@ public class AssemblyVersionLayoutRenderer : NLog.LayoutRenderers.AssemblyVersio
{
#if !ASP_NET_CORE
/// <summary>
/// Support capture of Assembly-Version from active HttpContext
/// Support capture of Assembly-Version from active HttpContext ApplicationInstance
/// </summary>
public LayoutRenderer ThreadAgnostic => string.IsNullOrEmpty(Name) ? _threadAgnostic : null;
private readonly LayoutRenderer _threadAgnostic = new ThreadIdLayoutRenderer();
public LayoutRenderer FixThreadAgnostic => string.IsNullOrEmpty(Name) ? _fixThreadAgnostic : null;
private readonly LayoutRenderer _fixThreadAgnostic = new ThreadIdLayoutRenderer();
#endif

/// <inheritdoc />
protected override void Append(StringBuilder builder, LogEventInfo logEvent)
protected override void InitializeLayoutRenderer()
{
InternalLogger.Trace("Extending ${assembly-version} " + nameof(NLog.LayoutRenderers.AssemblyVersionLayoutRenderer) + " with NLog.Web implementation");

base.Append(builder, logEvent);
InternalLogger.Debug("Extending ${assembly-version} " + nameof(NLog.LayoutRenderers.AssemblyVersionLayoutRenderer) + " with NLog.Web implementation");
base.InitializeLayoutRenderer();
}

/// <inheritdoc />
Expand Down