REFACTORING: removed explicit private to stay consistent with coding standards

REFACTORING: renamed GetLogLevel to GetLevel

Author: Sebastien Roche

src/Serilog.AspNetCore/AspNetCore/RequestLoggingMiddleware.cs

@@ -24,12 +24,12 @@
 
 namespace Serilog.AspNetCore
 {
-    internal class RequestLoggingMiddleware
+    class RequestLoggingMiddleware
     {
         readonly RequestDelegate _next;
         readonly DiagnosticContext _diagnosticContext;
         readonly MessageTemplate _messageTemplate;
-        readonly Func<HttpContext, LogEventLevel> _getLogLevel;
+        readonly Func<HttpContext, LogEventLevel> _getLevel;
         static readonly LogEventProperty[] NoProperties = new LogEventProperty[0];
 
         public RequestLoggingMiddleware(RequestDelegate next, DiagnosticContext diagnosticContext, RequestLoggingOptions options)
@@ -38,7 +38,7 @@ public RequestLoggingMiddleware(RequestDelegate next, DiagnosticContext diagnost
             _next = next ?? throw new ArgumentNullException(nameof(next));
             _diagnosticContext = diagnosticContext ?? throw new ArgumentNullException(nameof(diagnosticContext));
 
-            _getLogLevel = options.GetLogLevel;
+            _getLevel = options.GetLevel;
             _messageTemplate = new MessageTemplateParser().Parse(options.MessageTemplate);
         }
 
@@ -69,10 +69,10 @@ public async Task Invoke(HttpContext httpContext)
             }
         }
 
-        private bool LogCompletion(HttpContext httpContext, DiagnosticContextCollector collector, int statusCode, double elapsedMs, Exception ex)
+        bool LogCompletion(HttpContext httpContext, DiagnosticContextCollector collector, int statusCode, double elapsedMs, Exception ex)
         {
             var logger = Log.ForContext<RequestLoggingMiddleware>();
-            var level = _getLogLevel(httpContext);
+            var level = _getLevel(httpContext);
 
             if (!logger.IsEnabled(level)) return false;
 

src/Serilog.AspNetCore/AspNetCore/RequestLoggingOptions.cs

@@ -41,7 +41,7 @@ public class RequestLoggingOptions
         /// <value>
         /// The function returning the <see cref="LogEventLevel"/>.
         /// </value>
-        public Func<HttpContext, LogEventLevel> GetLogLevel { get; set; }
+        public Func<HttpContext, LogEventLevel> GetLevel { get; set; }
 
         internal RequestLoggingOptions() { }
     }

src/Serilog.AspNetCore/SerilogApplicationBuilderExtensions.cs

@@ -13,10 +13,8 @@
 // limitations under the License.
 
 using System;
-using System.Net;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Options;
 using Serilog.AspNetCore;
 using Serilog.Events;
 
@@ -30,7 +28,7 @@ public static class SerilogApplicationBuilderExtensions
         const string DefaultRequestCompletionMessageTemplate =
             "HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms";
 
-        static Func<HttpContext, LogEventLevel> DefaultGetLogLevel = 
+        static Func<HttpContext, LogEventLevel> DefaultGetLevel = 
             ctx => ctx.Response.StatusCode > 499 ? LogEventLevel.Error : LogEventLevel.Information;
 
         /// <summary>
@@ -71,15 +69,15 @@ public static IApplicationBuilder UseSerilogRequestLogging(
 
             var opts = new RequestLoggingOptions
             {
-                GetLogLevel = DefaultGetLogLevel,
+                GetLevel = DefaultGetLevel,
                 MessageTemplate = DefaultRequestCompletionMessageTemplate
             };
             configureOptions?.Invoke(opts);
 
             if (opts.MessageTemplate == null)
                 throw new ArgumentException($"{nameof(opts.MessageTemplate)} cannot be null.");
-            if (opts.GetLogLevel == null)
-                throw new ArgumentException($"{nameof(opts.GetLogLevel)} cannot be null.");
+            if (opts.GetLevel == null)
+                throw new ArgumentException($"{nameof(opts.GetLevel)} cannot be null.");
 
             return app.UseMiddleware<RequestLoggingMiddleware>(opts);
         }