huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

renaming TraceType to LogLevel

This commit is contained in:
SonjaKhan 2014-11-05 10:38:18 -08:00
parent 08c591c74b
commit 673854b060
9 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNet.Routing/Logging/LogFormatter.cs
View File

@ -9,7 +9,7 @@ namespace Microsoft.AspNet.Routing.Logging.Internal
{
/// <summary>
/// A formatter for use with <see cref="Microsoft.Framework.Logging.ILogger.WriteCore(
/// Framework.Logging.TraceType,
/// Framework.Logging.LogLevel,
/// int,
/// object,
/// Exception, Func{object, Exception, string})"/>.

2
src/Microsoft.AspNet.Routing/Logging/LoggerExtensions.cs
View File

@ -10,7 +10,7 @@ namespace Microsoft.AspNet.Routing.Logging.Internal
public static void WriteValues([NotNull] this ILogger logger, object values)
{
logger.Write(
eventType: TraceType.Verbose,
logLevel: LogLevel.Verbose,
eventId: 0,
state: values,
exception: null,

2
src/Microsoft.AspNet.Routing/RouteCollection.cs
View File

@ -81,7 +81,7 @@ namespace Microsoft.AspNet.Routing
}
}
if (_logger.IsEnabled(TraceType.Verbose))
if (_logger.IsEnabled(LogLevel.Verbose))
{
_logger.WriteValues(new RouteCollectionRouteAsyncValues()
{

4
src/Microsoft.AspNet.Routing/RouteConstraintMatcher.cs
View File

@ -29,7 +29,7 @@ namespace Microsoft.AspNet.Routing
if (!constraint.Match(httpContext, route, kvp.Key, routeValues, routeDirection))
{
if (routeDirection.Equals(RouteDirection.IncomingRequest)
&& logger.IsEnabled(TraceType.Verbose))
&& logger.IsEnabled(LogLevel.Verbose))
{
logger.WriteValues(new RouteConstraintMatcherMatchValues()
{
@ -43,7 +43,7 @@ namespace Microsoft.AspNet.Routing
}
if (routeDirection.Equals(RouteDirection.IncomingRequest)
&& logger.IsEnabled(TraceType.Verbose))
&& logger.IsEnabled(LogLevel.Verbose))
{
logger.WriteValues(new RouteConstraintMatcherMatchValues()
{

2
src/Microsoft.AspNet.Routing/RouterMiddleware.cs
View File

@ -43,7 +43,7 @@ namespace Microsoft.AspNet.Builder
await _router.RouteAsync(context);
if (_logger.IsEnabled(TraceType.Verbose))
if (_logger.IsEnabled(LogLevel.Verbose))
{
_logger.WriteValues(new RouterMiddlewareInvokeValues() { Handled = context.IsHandled });
}

6
src/Microsoft.AspNet.Routing/Template/TemplateRoute.cs
View File

@ -107,7 +107,7 @@ namespace Microsoft.AspNet.Routing.Template
if (values == null)
{
if (_logger.IsEnabled(TraceType.Verbose))
if (_logger.IsEnabled(LogLevel.Verbose))
{
_logger.WriteValues(CreateRouteAsyncValues(
requestPath,
@ -136,7 +136,7 @@ namespace Microsoft.AspNet.Routing.Template
RouteDirection.IncomingRequest,
_constraintLogger))
{
if (_logger.IsEnabled(TraceType.Verbose))
if (_logger.IsEnabled(LogLevel.Verbose))
{
_logger.WriteValues(CreateRouteAsyncValues(
requestPath,
@ -155,7 +155,7 @@ namespace Microsoft.AspNet.Routing.Template
await _target.RouteAsync(context);
if (_logger.IsEnabled(TraceType.Verbose))
if (_logger.IsEnabled(LogLevel.Verbose))
{
_logger.WriteValues(CreateRouteAsyncValues(
requestPath,

4
test/Microsoft.AspNet.Routing.Tests/Logging/NullLogger.cs
View File

@ -15,11 +15,11 @@ namespace Microsoft.AspNet.Routing
return NullDisposable.Instance;
}
public void Write(TraceType eventType, int eventId, object state, Exception exception, Func<object, Exception, string> formatter)
public void Write(LogLevel logLevel, int eventId, object state, Exception exception, Func<object, Exception, string> formatter)
{
}
public bool IsEnabled(TraceType eventType)
public bool IsEnabled(LogLevel logLevel)
{
return false;
}

6
test/Microsoft.AspNet.Routing.Tests/Logging/TestLogger.cs
View File

@ -35,11 +35,11 @@ namespace Microsoft.AspNet.Routing
return NullDisposable.Instance;
}
public void Write(TraceType eventType, int eventId, object state, Exception exception, Func<object, Exception, string> formatter)
public void Write(LogLevel logLevel, int eventId, object state, Exception exception, Func<object, Exception, string> formatter)
{
_sink.Write(new WriteContext()
{
EventType = eventType,
LogLevel = logLevel,
EventId = eventId,
State = state,
Exception = exception,
@ -49,7 +49,7 @@ namespace Microsoft.AspNet.Routing
});
}
public bool IsEnabled(TraceType eventType)
public bool IsEnabled(LogLevel logLevel)
{
return _enabled;
}

2
test/Microsoft.AspNet.Routing.Tests/Logging/WriteContext.cs
View File

@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Routing
{
public class WriteContext
{
public TraceType EventType { get; set; }
public LogLevel LogLevel { get; set; }
public int EventId { get; set; }