Include HttpContextBase in LogAtLevel override, Change duration to Ti…

…meSpan
serilog-web · Mar 10, 2021 · c6da797 · c6da797
1 parent 29fc3e8
commit c6da797
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/src/SerilogWeb.Classic/Classic/ApplicationLifecycleModule.cs b/src/SerilogWeb.Classic/Classic/ApplicationLifecycleModule.cs
@@ -39,7 +39,7 @@ public static ILogger Logger
             set => SerilogWebClassic.Configuration = new SerilogWebClassicConfiguration(
                 isEnabled: Config.IsEnabled,
                 requestLoggingLevel: Config.RequestLoggingLevel,
-                requestElapsedMSLogLevel: Config.RequestElapsedMSLogLevel,
+                requestContextLogLevel: Config.RequestContextLogLevel,
                 requestFilter: Config.RequestFilter,
                 formDataLoggingLevel: Config.FormDataLoggingLevel,
                 customLogger: value,
@@ -73,7 +73,7 @@ public static Func<HttpContextBase, bool> RequestFilter
                 SerilogWebClassic.Configuration = new SerilogWebClassicConfiguration(
                     isEnabled: Config.IsEnabled,
                     requestLoggingLevel: Config.RequestLoggingLevel,
-                    requestElapsedMSLogLevel: Config.RequestElapsedMSLogLevel,
+                    requestContextLogLevel: Config.RequestContextLogLevel,
                     requestFilter: value,
                     formDataLoggingLevel: Config.FormDataLoggingLevel,
                     customLogger: Config.CustomLogger,
@@ -101,7 +101,7 @@ public static LogPostedFormDataOption LogPostedFormData
             set => SerilogWebClassic.Configuration = new SerilogWebClassicConfiguration(
                 isEnabled: Config.IsEnabled,
                 requestLoggingLevel: Config.RequestLoggingLevel,
-                requestElapsedMSLogLevel: Config.RequestElapsedMSLogLevel,
+                requestContextLogLevel: Config.RequestContextLogLevel,
                 requestFilter: Config.RequestFilter,
                 formDataLoggingLevel: Config.FormDataLoggingLevel,
                 customLogger: Config.CustomLogger,
@@ -123,7 +123,7 @@ public static bool FilterPasswordsInFormData
             set => SerilogWebClassic.Configuration = new SerilogWebClassicConfiguration(
                 isEnabled: Config.IsEnabled,
                 requestLoggingLevel: Config.RequestLoggingLevel,
-                requestElapsedMSLogLevel: Config.RequestElapsedMSLogLevel,
+                requestContextLogLevel: Config.RequestContextLogLevel,
                 requestFilter: Config.RequestFilter,
                 formDataLoggingLevel: Config.FormDataLoggingLevel,
                 customLogger: Config.CustomLogger,
@@ -145,7 +145,7 @@ public static IEnumerable<String> FilteredKeywordsInFormData
             set => SerilogWebClassic.Configuration = new SerilogWebClassicConfiguration(
                 isEnabled: Config.IsEnabled,
                 requestLoggingLevel: Config.RequestLoggingLevel,
-                requestElapsedMSLogLevel: Config.RequestElapsedMSLogLevel,
+                requestContextLogLevel: Config.RequestContextLogLevel,
                 requestFilter: Config.RequestFilter,
                 formDataLoggingLevel: Config.FormDataLoggingLevel,
                 customLogger: Config.CustomLogger,
@@ -167,7 +167,7 @@ public static bool IsEnabled
             set => SerilogWebClassic.Configuration = new SerilogWebClassicConfiguration(
                 isEnabled: value,
                 requestLoggingLevel: Config.RequestLoggingLevel,
-                requestElapsedMSLogLevel: Config.RequestElapsedMSLogLevel,
+                requestContextLogLevel: Config.RequestContextLogLevel,
                 requestFilter: Config.RequestFilter,
                 formDataLoggingLevel: Config.FormDataLoggingLevel,
                 customLogger: Config.CustomLogger,
@@ -189,7 +189,7 @@ public static LogEventLevel RequestLoggingLevel
                 isEnabled: Config.IsEnabled,
                 requestLoggingLevel: value,
                 requestFilter: Config.RequestFilter,
-                requestElapsedMSLogLevel: Config.RequestElapsedMSLogLevel,
+                requestContextLogLevel: Config.RequestContextLogLevel,
                 formDataLoggingLevel: Config.FormDataLoggingLevel,
                 customLogger: Config.CustomLogger,
                 logPostedFormData: Config.LogPostedFormData,
@@ -210,7 +210,7 @@ public static LogEventLevel FormDataLoggingLevel
             set => SerilogWebClassic.Configuration = new SerilogWebClassicConfiguration(
                 isEnabled: Config.IsEnabled,
                 requestLoggingLevel: Config.RequestLoggingLevel,
-                requestElapsedMSLogLevel: Config.RequestElapsedMSLogLevel,
+                requestContextLogLevel: Config.RequestContextLogLevel,
                 requestFilter: Config.RequestFilter,
                 formDataLoggingLevel: value,
                 customLogger: Config.CustomLogger,
@@ -236,7 +236,7 @@ public static Func<HttpContextBase, bool> ShouldLogPostedFormData
                 SerilogWebClassic.Configuration = new SerilogWebClassicConfiguration(
                     isEnabled: Config.IsEnabled,
                     requestLoggingLevel: Config.RequestLoggingLevel,
-                    requestElapsedMSLogLevel: Config.RequestElapsedMSLogLevel,
+                    requestContextLogLevel: Config.RequestContextLogLevel,
                     requestFilter: Config.RequestFilter,
                     formDataLoggingLevel: Config.FormDataLoggingLevel,
                     customLogger: Config.CustomLogger,

diff --git a/src/SerilogWeb.Classic/Classic/SerilogWebClassicConfiguration.cs b/src/SerilogWeb.Classic/Classic/SerilogWebClassicConfiguration.cs
@@ -19,7 +19,7 @@ internal sealed class SerilogWebClassicConfiguration
         internal SerilogWebClassicConfiguration(
             bool isEnabled,
             LogEventLevel requestLoggingLevel,
-            Func<long, LogEventLevel> requestElapsedMSLogLevel,
+            Func<HttpContextBase, TimeSpan, LogEventLevel> requestContextLogLevel,
             Func<HttpContextBase, bool> requestFilter,
             LogEventLevel formDataLoggingLevel,
             ILogger customLogger,
@@ -30,7 +30,7 @@ internal SerilogWebClassicConfiguration(
         {
             IsEnabled = isEnabled;
             RequestLoggingLevel = requestLoggingLevel;
-            RequestElapsedMSLogLevel = requestElapsedMSLogLevel;
+            RequestContextLogLevel = requestContextLogLevel;
             RequestFilter = requestFilter;
             FormDataLoggingLevel = formDataLoggingLevel;
             CustomLogger = customLogger;
@@ -68,7 +68,7 @@ internal SerilogWebClassicConfiguration Edit(Func<SerilogWebClassicConfiguration
         internal bool IsEnabled { get; }
 
         internal LogEventLevel RequestLoggingLevel { get; }
-        internal Func<long, LogEventLevel> RequestElapsedMSLogLevel { get; }
+        internal Func<HttpContextBase, TimeSpan, LogEventLevel> RequestContextLogLevel { get; }
         internal ILogger CustomLogger { get; }
         internal Func<HttpContextBase, bool> RequestFilter { get; }
 

diff --git a/src/SerilogWeb.Classic/Classic/SerilogWebClassicConfigurationBuilder.cs b/src/SerilogWeb.Classic/Classic/SerilogWebClassicConfigurationBuilder.cs
@@ -18,7 +18,7 @@ public class SerilogWebClassicConfigurationBuilder
         private bool IsEnabled { get; set; } = true;
 
         private LogEventLevel RequestLoggingLevel { get; set; }
-        private Func<long, LogEventLevel> RequestElapsedMSLogLevel { get; set; }
+        private Func<HttpContextBase, TimeSpan, LogEventLevel> RequestContextLogLevel { get; set; }
         private ILogger CustomLogger { get; set; }
         private Func<HttpContextBase, bool> RequestFilter { get; set; }
 
@@ -40,7 +40,7 @@ internal SerilogWebClassicConfigurationBuilder(SerilogWebClassicConfiguration co
             CustomLogger = configToCopy.CustomLogger;
             IsEnabled = configToCopy.IsEnabled;
             RequestLoggingLevel = configToCopy.RequestLoggingLevel;
-            RequestElapsedMSLogLevel = configToCopy.RequestElapsedMSLogLevel;
+            RequestContextLogLevel = configToCopy.RequestContextLogLevel;
             RequestFilter = configToCopy.RequestFilter;
             FormDataLoggingLevel = configToCopy.FormDataLoggingLevel;
             LogPostedFormData = configToCopy.LogPostedFormData;
@@ -72,7 +72,7 @@ internal SerilogWebClassicConfiguration Build()
             return new SerilogWebClassicConfiguration(
                 isEnabled: IsEnabled,
                 requestLoggingLevel: RequestLoggingLevel,
-                requestElapsedMSLogLevel: RequestElapsedMSLogLevel,
+                requestContextLogLevel: RequestContextLogLevel,
                 requestFilter: RequestFilter,
                 formDataLoggingLevel: FormDataLoggingLevel,
                 customLogger: CustomLogger,
@@ -120,11 +120,11 @@ public SerilogWebClassicConfigurationBuilder LogAtLevel(LogEventLevel level)
         /// Configure at which level HTTP requests are logged.
         /// Default is Information
         /// </summary>
-        /// <param name="requestElapsedMSLogLevel">Override the default log level based on the total request time in milliseconds</param>
+        /// <param name="requestContextLogLevel">Override the default log level based on the current http context and total request time</param>
         /// <returns>A configuration object to allow chaining</returns>
-        public SerilogWebClassicConfigurationBuilder LogAtLevel(Func<long, LogEventLevel> requestElapsedMSLogLevel)
+        public SerilogWebClassicConfigurationBuilder LogAtLevel(Func<HttpContextBase, TimeSpan, LogEventLevel> requestContextLogLevel)
         {
-            RequestElapsedMSLogLevel = requestElapsedMSLogLevel;
+            RequestContextLogLevel = requestContextLogLevel;
             return this;
         }
 

diff --git a/src/SerilogWeb.Classic/Classic/WebRequestLoggingHandler.cs b/src/SerilogWeb.Classic/Classic/WebRequestLoggingHandler.cs
@@ -44,7 +44,7 @@ internal void OnLogRequest(SerilogWebClassicConfiguration configuration)
 
             var error = _application.Context.GetLastSerilogWebError() ?? _application.Server.GetLastError();
 
-            var configurationLevel = configuration.RequestElapsedMSLogLevel != null ? configuration.RequestElapsedMSLogLevel(stopwatch.ElapsedMilliseconds) : configuration.RequestLoggingLevel;
+            var configurationLevel = configuration.RequestContextLogLevel != null ? configuration.RequestContextLogLevel(_application.Context, stopwatch.Elapsed) : configuration.RequestLoggingLevel;
 
             var level = error != null || _application.Response.StatusCode >= 500 ? LogEventLevel.Error : configurationLevel;