From cdf6350b930d79fe62695c33236b529004571294 Mon Sep 17 00:00:00 2001
From: Brennan <brecon@microsoft.com>
Date: Wed, 4 Mar 2015 17:14:23 -0800
Subject: [PATCH] Logging API changes

---
 src/Microsoft.AspNet.Server.WebListener/LogHelper.cs   | 10 +++++-----
 src/Microsoft.Net.Http.Server/LogHelper.cs             | 10 +++++-----
 .../RequestProcessing/Request.cs                       |  5 ++---
 .../RequestProcessing/Response.cs                      |  5 ++---
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/Microsoft.AspNet.Server.WebListener/LogHelper.cs b/src/Microsoft.AspNet.Server.WebListener/LogHelper.cs
index 2501c20620..c742caa87d 100644
--- a/src/Microsoft.AspNet.Server.WebListener/LogHelper.cs
+++ b/src/Microsoft.AspNet.Server.WebListener/LogHelper.cs
@@ -37,7 +37,7 @@ namespace Microsoft.AspNet.Server.WebListener
                 return null;
             }
 
-            return factory.Create(type.FullName);
+            return factory.CreateLogger(type.FullName);
         }
 
         internal static void LogInfo(ILogger logger, string data)
@@ -48,7 +48,7 @@ namespace Microsoft.AspNet.Server.WebListener
             }
             else
             {
-                logger.WriteInformation(data);
+                logger.LogInformation(data);
             }
         }
 
@@ -60,7 +60,7 @@ namespace Microsoft.AspNet.Server.WebListener
             }
             else
             {
-                logger.WriteVerbose(data);
+                logger.LogVerbose(data);
             }
         }
 
@@ -77,7 +77,7 @@ namespace Microsoft.AspNet.Server.WebListener
             }
             else
             {
-                logger.WriteError(location, exception);
+                logger.LogError(location, exception);
             }
         }
 
@@ -89,7 +89,7 @@ namespace Microsoft.AspNet.Server.WebListener
             }
             else
             {
-                logger.WriteError(location + "; " + message);
+                logger.LogError(location + "; " + message);
             }
         }
     }
diff --git a/src/Microsoft.Net.Http.Server/LogHelper.cs b/src/Microsoft.Net.Http.Server/LogHelper.cs
index b67a077da5..7413e56a70 100644
--- a/src/Microsoft.Net.Http.Server/LogHelper.cs
+++ b/src/Microsoft.Net.Http.Server/LogHelper.cs
@@ -37,7 +37,7 @@ namespace Microsoft.Net.Http.Server
                 factory = new LoggerFactory();
             }
 
-            return factory.Create(type.FullName);
+            return factory.CreateLogger(type.FullName);
         }
 
         internal static void LogInfo(ILogger logger, string data)
@@ -48,7 +48,7 @@ namespace Microsoft.Net.Http.Server
             }
             else
             {
-                logger.WriteInformation(data);
+                logger.LogInformation(data);
             }
         }
 
@@ -60,7 +60,7 @@ namespace Microsoft.Net.Http.Server
             }
             else
             {
-                logger.WriteVerbose(data);
+                logger.LogVerbose(data);
             }
         }
 
@@ -72,7 +72,7 @@ namespace Microsoft.Net.Http.Server
             }
             else
             {
-                logger.WriteError(location, exception);
+                logger.LogError(location, exception);
             }
         }
 
@@ -84,7 +84,7 @@ namespace Microsoft.Net.Http.Server
             }
             else
             {
-                logger.WriteError(location + "; " + message);
+                logger.LogError(location + "; " + message);
             }
         }
     }
diff --git a/src/Microsoft.Net.Http.Server/RequestProcessing/Request.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/Request.cs
index bee0c09df9..938b694355 100644
--- a/src/Microsoft.Net.Http.Server/RequestProcessing/Request.cs
+++ b/src/Microsoft.Net.Http.Server/RequestProcessing/Request.cs
@@ -149,7 +149,7 @@ namespace Microsoft.Net.Http.Server
 
             if (_requestContext.Logger.IsEnabled(LogLevel.Verbose))
             {
-                RequestContext.Logger.WriteVerbose(new ReceiveRequestLogContext(this));
+                RequestContext.Logger.LogVerbose(new ReceiveRequestLogContext(this));
             }
         }
 
@@ -514,14 +514,13 @@ namespace Microsoft.Net.Http.Server
             }
         }
 
-        private class ReceiveRequestLogContext : LoggerStructureBase
+        private class ReceiveRequestLogContext : ReflectionBasedLogValues
         {
             private readonly Request _request;
 
             internal ReceiveRequestLogContext(Request request)
             {
                 _request = request;
-                Message = "Received Request";
             }
 
             public string Method { get { return _request.Method; } }
diff --git a/src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs
index c1a3c7b373..50be415fcc 100644
--- a/src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs
+++ b/src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs
@@ -366,7 +366,7 @@ namespace Microsoft.Net.Http.Server
 
             if (RequestContext.Logger.IsEnabled(LogLevel.Verbose))
             {
-                RequestContext.Logger.WriteVerbose(new SendResponseLogContext(this));
+                RequestContext.Logger.LogVerbose(new SendResponseLogContext(this));
             }
 
             /*
@@ -845,14 +845,13 @@ namespace Microsoft.Net.Http.Server
             }
         }
 
-        private class SendResponseLogContext : LoggerStructureBase
+        private class SendResponseLogContext : ReflectionBasedLogValues
         {
             private readonly Response _response;
 
             internal SendResponseLogContext(Response response)
             {
                 _response = response;
-                Message = "Sending Response";
             }
 
             public string Protocol { get { return "HTTP/1.1"; } } // HTTP.SYS only allows 1.1 responses.