Skip to content

Commit

Permalink
Fix AssemblyVersionLayoutRenderer on ASP.NET to work with async=true …
Browse files Browse the repository at this point in the history
…(Rename to FixThreadAgnostic) (#635)
  • Loading branch information
snakefoot authored Feb 17, 2021
1 parent e414b70 commit 3dc7ccc
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions src/Shared/LayoutRenderers/AssemblyVersionLayoutRenderer.cs
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

0 comments on commit 3dc7ccc

Please sign in to comment.