From 7a310a35db634a2f050658474191013653c8ad2c Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 2 Dec 2015 17:28:54 -0800 Subject: [PATCH] Reacting to verbose rename --- samples/SelfHostServer/Startup.cs | 2 +- src/Microsoft.AspNet.Server.WebListener/LogHelper.cs | 9 ++++----- src/Microsoft.AspNet.Server.WebListener/MessagePump.cs | 2 +- src/Microsoft.Net.Http.Server/LogHelper.cs | 4 ++-- .../RequestProcessing/Request.cs | 4 ++-- .../RequestProcessing/Response.cs | 4 ++-- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/samples/SelfHostServer/Startup.cs b/samples/SelfHostServer/Startup.cs index 1af9163..f9d7649 100644 --- a/samples/SelfHostServer/Startup.cs +++ b/samples/SelfHostServer/Startup.cs @@ -17,7 +17,7 @@ public void Configure(IApplicationBuilder app, ILoggerFactory loggerfactory) var listener = app.ServerFeatures.Get(); listener.AuthenticationManager.AuthenticationSchemes = AuthenticationSchemes.AllowAnonymous; - loggerfactory.AddConsole(LogLevel.Verbose); + loggerfactory.AddConsole(LogLevel.Debug); app.Run(async context => { diff --git a/src/Microsoft.AspNet.Server.WebListener/LogHelper.cs b/src/Microsoft.AspNet.Server.WebListener/LogHelper.cs index 727c287..5db901b 100644 --- a/src/Microsoft.AspNet.Server.WebListener/LogHelper.cs +++ b/src/Microsoft.AspNet.Server.WebListener/LogHelper.cs @@ -23,7 +23,6 @@ using System; using System.Diagnostics; -using System.Globalization; using Microsoft.Extensions.Logging; namespace Microsoft.AspNet.Server.WebListener @@ -52,7 +51,7 @@ internal static void LogInfo(ILogger logger, string data) } } - internal static void LogVerbose(ILogger logger, string data) + internal static void LogDebug(ILogger logger, string data) { if (logger == null) { @@ -60,13 +59,13 @@ internal static void LogVerbose(ILogger logger, string data) } else { - logger.LogVerbose(data); + logger.LogDebug(data); } } - internal static void LogVerbose(ILogger logger, string location, Exception exception) + internal static void LogDebug(ILogger logger, string location, Exception exception) { - LogVerbose(logger, location + "; " + exception.ToString()); + LogDebug(logger, location + "; " + exception.ToString()); } internal static void LogException(ILogger logger, string location, Exception exception) diff --git a/src/Microsoft.AspNet.Server.WebListener/MessagePump.cs b/src/Microsoft.AspNet.Server.WebListener/MessagePump.cs index 7476929..9cb66bc 100644 --- a/src/Microsoft.AspNet.Server.WebListener/MessagePump.cs +++ b/src/Microsoft.AspNet.Server.WebListener/MessagePump.cs @@ -147,7 +147,7 @@ private async void ProcessRequestsWorker() Contract.Assert(_stopping); if (_stopping) { - LogHelper.LogVerbose(_logger, "ListenForNextRequestAsync-Stopping", exception); + LogHelper.LogDebug(_logger, "ListenForNextRequestAsync-Stopping", exception); } else { diff --git a/src/Microsoft.Net.Http.Server/LogHelper.cs b/src/Microsoft.Net.Http.Server/LogHelper.cs index cce8320..da3c22d 100644 --- a/src/Microsoft.Net.Http.Server/LogHelper.cs +++ b/src/Microsoft.Net.Http.Server/LogHelper.cs @@ -51,7 +51,7 @@ internal static void LogInfo(ILogger logger, string data) } } - internal static void LogVerbose(ILogger logger, string data) + internal static void LogDebug(ILogger logger, string data) { if (logger == null) { @@ -59,7 +59,7 @@ internal static void LogVerbose(ILogger logger, string data) } else { - logger.LogVerbose(data); + logger.LogDebug(data); } } diff --git a/src/Microsoft.Net.Http.Server/RequestProcessing/Request.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/Request.cs index 87186a1..a38bd82 100644 --- a/src/Microsoft.Net.Http.Server/RequestProcessing/Request.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/Request.cs @@ -151,9 +151,9 @@ internal unsafe Request(RequestContext httpContext, NativeRequestContext memoryB // TODO: Verbose log parameters - if (_requestContext.Logger.IsEnabled(LogLevel.Verbose)) + if (_requestContext.Logger.IsEnabled(LogLevel.Debug)) { - RequestContext.Logger.LogVerbose(new ReceiveRequestLogContext(this)); + RequestContext.Logger.LogDebug(new ReceiveRequestLogContext(this)); } } diff --git a/src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs index a23db82..5c174ad 100644 --- a/src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs @@ -356,9 +356,9 @@ internal unsafe uint SendHeaders(HttpApi.HTTP_DATA_CHUNK[] dataChunks, _responseState = ResponseState.StartedSending; var reasonPhrase = GetReasonPhrase(StatusCode); - if (RequestContext.Logger.IsEnabled(LogLevel.Verbose)) + if (RequestContext.Logger.IsEnabled(LogLevel.Debug)) { - RequestContext.Logger.LogVerbose(new SendResponseLogContext(this)); + RequestContext.Logger.LogDebug(new SendResponseLogContext(this)); } /*