Merge pull request #13 from neozhu/dev

WIP: add clientinfo serilog configuration
neozhu · Sep 9, 2021 · 2d27b44 · 2d27b44
2 parents 05a6c9f + 511640b
commit 2d27b44
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/SmartAdmin.WebUI/Startup.cs b/src/SmartAdmin.WebUI/Startup.cs
@@ -13,6 +13,7 @@
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
+using Serilog;
 using SmartAdmin.WebUI.Extensions;
 using SmartAdmin.WebUI.Models;
 using SmartAdmin.WebUI.Services;
@@ -110,6 +111,12 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 FileProvider = new PhysicalFileProvider(Path.Combine(Directory.GetCurrentDirectory(), @"Files")),
                 RequestPath = new PathString("/Files")
             });
+            app.UseSerilogRequestLogging(options =>
+            {
+                options.EnrichDiagnosticContext = (diagnosticContext, httpContext) => {
+                    diagnosticContext.Set("UserName", httpContext.User?.Identity?.Name??string.Empty);
+                };
+            });
             app.UseRequestLocalization();
             app.UseRequestLocalizationCookies();
             app.UseRouting();

diff --git a/src/SmartAdmin.WebUI/appsettings.json b/src/SmartAdmin.WebUI/appsettings.json
@@ -60,20 +60,22 @@
         "Microsoft.Hosting.Lifetime": "Information"
       }
     },
+    "Using": [ "Serilog.Enrichers.ClientInfo" ],
+    "Enrich": [ "WithClientIp", "WithClientAgent" ],
     "WriteTo": [
       {
         "Name": "File",
         "Args": {
           "path": "./logs/log-.txt",
-          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}",
+          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj} {ClientIp}{NewLine}{Exception}",
           "rollingInterval": "Day"
         }
       },
       {
         "Name": "Console",
         "Args": {
           "theme": "Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme::Code, Serilog.Sinks.Console",
-          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj} <s:{SourceContext}>{NewLine}{Exception}"
+          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj} {ClientIp} <s:{SourceContext}>{NewLine}{Exception}"
         }
       }
     ]