Removed ${aspnet-request-posted-body} because NLog 5.0 only supports …

…threadsafe layoutrenderers (#754)
NLog · Feb 12, 2022 · 0ef9c88 · 0ef9c88
1 parent 2092a8e
commit 0ef9c88
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 319 deletions.
diff --git a/examples/ASP.NET 4.6.1/Visual Studio 2017/ASP.NET 4.6.1 - VS2017/NLog.config b/examples/ASP.NET 4.6.1/Visual Studio 2017/ASP.NET 4.6.1 - VS2017/NLog.config
@@ -15,7 +15,7 @@
   <targets>
     <!-- write logs to file  -->
     <target xsi:type="File" name="allfile" fileName="c:\temp\nlog-AspNetWeb-${shortdate}.log"
-            layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}|${callsite}" />
+            layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${level:uppercase=true}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}|${callsite}" />
   </targets>
 
   <!-- rules to map from logger name to target -->

diff --git a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/NLog.config b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/NLog.config
@@ -15,11 +15,11 @@
   <targets>
     <!-- write logs to file  -->
     <target xsi:type="File" name="allfile" fileName="c:\temp\nlog-AspNetCore2-all-${shortdate}.log"
-            layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}" />
+            layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${level:uppercase=true}|${logger}|${message} ${exception:format=tostring}" />
 
     <!-- another file log, only own logs. Uses some ASP.NET core renderers -->
     <target xsi:type="File" name="ownFile-web" fileName="c:\temp\nlog-AspNetCore2-own-${shortdate}.log"
-            layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}" />
+            layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${level:uppercase=true}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}" />
   </targets>
 
   <!-- rules to map from logger name to target -->

diff --git a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/NLog.config b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/NLog.config
@@ -15,11 +15,11 @@
   <targets>
     <!-- File Target for all log messages with basic details -->
     <target xsi:type="File" name="allfile" fileName="c:\temp\nlog-AspNetCore3-all-${shortdate}.log"
-            layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}" />
+            layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${level:uppercase=true}|${logger}|${message} ${exception:format=tostring}" />
 
     <!-- File Target for own log messages with extra web details using some ASP.NET core renderers -->
     <target xsi:type="File" name="ownFile-web" fileName="c:\temp\nlog-AspNetCore3-own-${shortdate}.log"
-            layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}" />
+            layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${level:uppercase=true}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}" />
 
     <!--Console Target for hosting lifetime messages to improve Docker / Visual Studio startup detection -->
     <target xsi:type="Console" name="lifetimeConsole" layout="${MicrosoftConsoleLayout}" />

diff --git a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Startup.cs b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Startup.cs
@@ -45,20 +45,12 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             app.UseRouting();
             app.UseAuthorization();
 
-            // needed for  ${aspnet-request-posted-body} with an API Controller. Must be before app.UseEndpoints
-            app.Use(async (context, next) => {
-                context.Request.EnableBuffering();
-                await next();
-            });
-
             app.UseEndpoints(endpoints =>
             {
                 endpoints.MapControllerRoute(
                     name: "default",
                     pattern: "{controller=Home}/{action=Index}/{id?}");
             });
-
-
         }
     }
 }
diff --git a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/nlog.config b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/nlog.config
@@ -15,11 +15,11 @@
   <targets>
     <!-- File Target for all log messages with basic details -->
     <target xsi:type="File" name="allfile" fileName="c:\temp\nlog-AspNetCore5-all-${shortdate}.log"
-            layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}" />
+            layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${level:uppercase=true}|${logger}|${message} ${exception:format=tostring}" />
 
     <!-- File Target for own log messages with extra web details using some ASP.NET core renderers -->
     <target xsi:type="File" name="ownFile-web" fileName="c:\temp\nlog-AspNetCore5-own-${shortdate}.log"
-            layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}|${callsite}| body: ${aspnet-request-posted-body}" />
+            layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${level:uppercase=true}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}|${callsite}" />
 
     <!--Console Target for hosting lifetime messages to improve Docker / Visual Studio startup detection -->
     <target xsi:type="Console" name="lifetimeConsole" layout="${MicrosoftConsoleLayout}" />

diff --git a/examples/ASP.NET Core 6/ASP.NET Core 6 NLog Example/nlog.config b/examples/ASP.NET Core 6/ASP.NET Core 6 NLog Example/nlog.config
@@ -15,11 +15,11 @@
   <targets>
     <!-- File Target for all log messages with basic details -->
     <target xsi:type="File" name="allfile" fileName="c:\temp\nlog-AspNetCore6-all-${shortdate}.log"
-            layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}" />
+            layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${level:uppercase=true}|${logger}|${message} ${exception:format=tostring}" />
 
     <!-- File Target for own log messages with extra web details using some ASP.NET core renderers -->
     <target xsi:type="File" name="ownFile-web" fileName="c:\temp\nlog-AspNetCore6-own-${shortdate}.log"
-            layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}|${callsite}| body: ${aspnet-request-posted-body}" />
+            layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${level:uppercase=true}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}|${callsite}" />
 
     <!--Console Target for hosting lifetime messages to improve Docker / Visual Studio startup detection -->
     <target xsi:type="Console" name="lifetimeConsole" layout="${MicrosoftConsoleLayout}" />

diff --git a/src/Shared/LayoutRenderers/AspNetRequestPostedBody.cs b/src/Shared/LayoutRenderers/AspNetRequestPostedBody.cs
diff --git a/tests/Shared/LayoutRenderers/AspNetRequestPostedBodyTests.cs b/tests/Shared/LayoutRenderers/AspNetRequestPostedBodyTests.cs