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:19:10 -08:00
parent 687b174b63
commit 27e0323a8a
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Microsoft.AspNet.Mvc.Core/DefaultActionSelector.cs
View File

@ -64,7 +64,7 @@ namespace Microsoft.AspNet.Mvc
if (finalMatches == null || finalMatches.Count == 0)
{
if (_logger.IsEnabled(TraceType.Verbose))
if (_logger.IsEnabled(LogLevel.Verbose))
{
_logger.WriteValues(new DefaultActionSelectorSelectAsyncValues()
{
@ -80,7 +80,7 @@ namespace Microsoft.AspNet.Mvc
{
var selectedAction = finalMatches[0];
if (_logger.IsEnabled(TraceType.Verbose))
if (_logger.IsEnabled(LogLevel.Verbose))
{
_logger.WriteValues(new DefaultActionSelectorSelectAsyncValues()
{
@ -95,7 +95,7 @@ namespace Microsoft.AspNet.Mvc
}
else
{
if (_logger.IsEnabled(TraceType.Verbose))
if (_logger.IsEnabled(LogLevel.Verbose))
{
_logger.WriteValues(new DefaultActionSelectorSelectAsyncValues()
{

2
src/Microsoft.AspNet.Mvc.Core/Logging/LogFormatter.cs
View File

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

2
src/Microsoft.AspNet.Mvc.Core/Logging/LoggerExtensions.cs
View File

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

6
src/Microsoft.AspNet.Mvc.Core/MvcRouteHandler.cs
View File

@ -52,7 +52,7 @@ namespace Microsoft.AspNet.Mvc
if (actionDescriptor == null)
{
if (_logger.IsEnabled(TraceType.Verbose))
if (_logger.IsEnabled(LogLevel.Verbose))
{
_logger.WriteValues(new MvcRouteHandlerRouteAsyncValues()
{
@ -96,7 +96,7 @@ namespace Microsoft.AspNet.Mvc
// tacking on extra data on the exception?)
ex.Data.Add("AD", actionDescriptor);
if (_logger.IsEnabled(TraceType.Verbose))
if (_logger.IsEnabled(LogLevel.Verbose))
{
_logger.WriteValues(new MvcRouteHandlerRouteAsyncValues()
{
@ -112,7 +112,7 @@ namespace Microsoft.AspNet.Mvc
await invoker.InvokeAsync();
context.IsHandled = true;
if (_logger.IsEnabled(TraceType.Verbose))
if (_logger.IsEnabled(LogLevel.Verbose))
{
_logger.WriteValues(new MvcRouteHandlerRouteAsyncValues()
{

2
src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRoute.cs
View File

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

4
test/Microsoft.AspNet.Mvc.Core.Test/Logging/NullLogger.cs
View File

@ -15,11 +15,11 @@ namespace Microsoft.AspNet.Mvc
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.Mvc.Core.Test/Logging/TestLogger.cs
View File

@ -33,11 +33,11 @@ namespace Microsoft.AspNet.Mvc
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,
@ -47,7 +47,7 @@ namespace Microsoft.AspNet.Mvc
});
}
public bool IsEnabled(TraceType eventType)
public bool IsEnabled(LogLevel logLevel)
{
return true;
}

2
test/Microsoft.AspNet.Mvc.Core.Test/Logging/WriteContext.cs
View File

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

4
test/Microsoft.AspNet.Mvc.FunctionalTests/NullLoggerFactory.cs
View File

@ -27,11 +27,11 @@ namespace Microsoft.AspNet.Mvc
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;
}