Logging API changes

This commit is contained in:
Brennan 2015-03-04 17:14:23 -08:00
parent ca3259f703
commit cdf6350b93
4 changed files with 14 additions and 16 deletions

View File

@ -37,7 +37,7 @@ namespace Microsoft.AspNet.Server.WebListener
return null; return null;
} }
return factory.Create(type.FullName); return factory.CreateLogger(type.FullName);
} }
internal static void LogInfo(ILogger logger, string data) internal static void LogInfo(ILogger logger, string data)
@ -48,7 +48,7 @@ namespace Microsoft.AspNet.Server.WebListener
} }
else else
{ {
logger.WriteInformation(data); logger.LogInformation(data);
} }
} }
@ -60,7 +60,7 @@ namespace Microsoft.AspNet.Server.WebListener
} }
else else
{ {
logger.WriteVerbose(data); logger.LogVerbose(data);
} }
} }
@ -77,7 +77,7 @@ namespace Microsoft.AspNet.Server.WebListener
} }
else else
{ {
logger.WriteError(location, exception); logger.LogError(location, exception);
} }
} }
@ -89,7 +89,7 @@ namespace Microsoft.AspNet.Server.WebListener
} }
else else
{ {
logger.WriteError(location + "; " + message); logger.LogError(location + "; " + message);
} }
} }
} }

View File

@ -37,7 +37,7 @@ namespace Microsoft.Net.Http.Server
factory = new LoggerFactory(); factory = new LoggerFactory();
} }
return factory.Create(type.FullName); return factory.CreateLogger(type.FullName);
} }
internal static void LogInfo(ILogger logger, string data) internal static void LogInfo(ILogger logger, string data)
@ -48,7 +48,7 @@ namespace Microsoft.Net.Http.Server
} }
else else
{ {
logger.WriteInformation(data); logger.LogInformation(data);
} }
} }
@ -60,7 +60,7 @@ namespace Microsoft.Net.Http.Server
} }
else else
{ {
logger.WriteVerbose(data); logger.LogVerbose(data);
} }
} }
@ -72,7 +72,7 @@ namespace Microsoft.Net.Http.Server
} }
else else
{ {
logger.WriteError(location, exception); logger.LogError(location, exception);
} }
} }
@ -84,7 +84,7 @@ namespace Microsoft.Net.Http.Server
} }
else else
{ {
logger.WriteError(location + "; " + message); logger.LogError(location + "; " + message);
} }
} }
} }

View File

@ -149,7 +149,7 @@ namespace Microsoft.Net.Http.Server
if (_requestContext.Logger.IsEnabled(LogLevel.Verbose)) 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; private readonly Request _request;
internal ReceiveRequestLogContext(Request request) internal ReceiveRequestLogContext(Request request)
{ {
_request = request; _request = request;
Message = "Received Request";
} }
public string Method { get { return _request.Method; } } public string Method { get { return _request.Method; } }

View File

@ -366,7 +366,7 @@ namespace Microsoft.Net.Http.Server
if (RequestContext.Logger.IsEnabled(LogLevel.Verbose)) 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; private readonly Response _response;
internal SendResponseLogContext(Response response) internal SendResponseLogContext(Response response)
{ {
_response = response; _response = response;
Message = "Sending Response";
} }
public string Protocol { get { return "HTTP/1.1"; } } // HTTP.SYS only allows 1.1 responses. public string Protocol { get { return "HTTP/1.1"; } } // HTTP.SYS only allows 1.1 responses.