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

React to Logging API changes

This commit is contained in:
Brennan 2016-01-21 09:47:47 -08:00
parent e62ceb8528
commit 3ea44c6f75
5 changed files with 123 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
src/Microsoft.AspNetCore.Hosting/Internal/HostingLoggerExtensions.cs
View File

@ -2,8 +2,9 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using System.Diagnostics; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -52,7 +53,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal
logger.LogError( logger.LogError(
eventId: LoggerEventIds.ApplicationStartupException, eventId: LoggerEventIds.ApplicationStartupException,
message: "Application startup exception", message: "Application startup exception",
error: exception); exception: exception);
} }
public static void Starting(this ILogger logger) public static void Starting(this ILogger logger)
@ -61,7 +62,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal
{ {
logger.LogDebug( logger.LogDebug(
eventId: LoggerEventIds.Starting, eventId: LoggerEventIds.Starting,
data: "Hosting starting"); message: "Hosting starting");
} }
} }
@ -71,7 +72,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal
{ {
logger.LogDebug( logger.LogDebug(
eventId: LoggerEventIds.Started, eventId: LoggerEventIds.Started,
data: "Hosting started"); message: "Hosting started");
} }
} }
@ -81,17 +82,40 @@ namespace Microsoft.AspNetCore.Hosting.Internal
{ {
logger.LogDebug( logger.LogDebug(
eventId: LoggerEventIds.Shutdown, eventId: LoggerEventIds.Shutdown,
data: "Hosting shutdown"); message: "Hosting shutdown");
} }
} }
private class HostingLogScope : ILogValues private class HostingLogScope : IReadOnlyList<KeyValuePair<string, object>>
{ {
private readonly HttpContext _httpContext; private readonly HttpContext _httpContext;
private string _cachedToString; private string _cachedToString;
private IEnumerable<KeyValuePair<string, object>> _cachedGetValues;
public int Count
{
get
{
return 2;
}
}
public KeyValuePair<string, object> this[int index]
{
get
{
if (index == 0)
{
return new KeyValuePair<string, object>("RequestId", _httpContext.TraceIdentifier);
}
else if (index == 1)
{
return new KeyValuePair<string, object>("RequestPath", _httpContext.Request.Path.ToString());
}
throw new IndexOutOfRangeException(nameof(index));
}
}
public HostingLogScope(HttpContext httpContext) public HostingLogScope(HttpContext httpContext)
{ {
@ -108,29 +132,65 @@ namespace Microsoft.AspNetCore.Hosting.Internal
return _cachedToString; return _cachedToString;
} }
public IEnumerable<KeyValuePair<string, object>> GetValues() public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
{ {
if (_cachedGetValues == null) for (int i = 0; i < Count; ++i)
{ {
_cachedGetValues = new[] yield return this[i];
{
new KeyValuePair<string, object>("RequestId", _httpContext.TraceIdentifier),
new KeyValuePair<string, object>("RequestPath", _httpContext.Request.Path.ToString()),
};
} }
}
return _cachedGetValues; IEnumerator IEnumerable.GetEnumerator()
{
return GetEnumerator();
} }
} }
private class HostingRequestStarting : ILogValues private class HostingRequestStarting : IReadOnlyList<KeyValuePair<string, object>>
{ {
internal static readonly Func<object, Exception, string> Callback = (state, exception) => ((HostingRequestStarting)state).ToString(); internal static readonly Func<object, Exception, string> Callback = (state, exception) => ((HostingRequestStarting)state).ToString();
private readonly HttpRequest _request; private readonly HttpRequest _request;
private string _cachedToString; private string _cachedToString;
private IEnumerable<KeyValuePair<string, object>> _cachedGetValues;
public int Count
{
get
{
return 9;
}
}
public KeyValuePair<string, object> this[int index]
{
get
{
switch (index)
{
case 0:
return new KeyValuePair<string, object>("Protocol", _request.Protocol);
case 1:
return new KeyValuePair<string, object>("Method", _request.Method);
case 2:
return new KeyValuePair<string, object>("ContentType", _request.ContentType);
case 3:
return new KeyValuePair<string, object>("ContentLength", _request.ContentLength);
case 4:
return new KeyValuePair<string, object>("Scheme", _request.Scheme.ToString());
case 5:
return new KeyValuePair<string, object>("Host", _request.Host.ToString());
case 6:
return new KeyValuePair<string, object>("PathBase", _request.PathBase.ToString());
case 7:
return new KeyValuePair<string, object>("Path", _request.Path.ToString());
case 8:
return new KeyValuePair<string, object>("QueryString", _request.QueryString.ToString());
default:
throw new IndexOutOfRangeException(nameof(index));
}
}
}
public HostingRequestStarting(HttpContext httpContext) public HostingRequestStarting(HttpContext httpContext)
{ {
@ -147,38 +207,55 @@ namespace Microsoft.AspNetCore.Hosting.Internal
return _cachedToString; return _cachedToString;
} }
public IEnumerable<KeyValuePair<string, object>> GetValues() public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
{ {
if (_cachedGetValues == null) for (int i = 0; i < Count; ++i)
{ {
_cachedGetValues = new[] yield return this[i];
{
new KeyValuePair<string, object>("Protocol", _request.Protocol),
new KeyValuePair<string, object>("Method", _request.Method),
new KeyValuePair<string, object>("ContentType", _request.ContentType),
new KeyValuePair<string, object>("ContentLength", _request.ContentLength),
new KeyValuePair<string, object>("Scheme", _request.Scheme.ToString()),
new KeyValuePair<string, object>("Host", _request.Host.ToString()),
new KeyValuePair<string, object>("PathBase", _request.PathBase.ToString()),
new KeyValuePair<string, object>("Path", _request.Path.ToString()),
new KeyValuePair<string, object>("QueryString", _request.QueryString.ToString()),
};
} }
}
return _cachedGetValues; IEnumerator IEnumerable.GetEnumerator()
{
return GetEnumerator();
} }
} }
private class HostingRequestFinished private class HostingRequestFinished : IReadOnlyList<KeyValuePair<string, object>>
{ {
internal static readonly Func<object, Exception, string> Callback = (state, exception) => ((HostingRequestFinished)state).ToString(); internal static readonly Func<object, Exception, string> Callback = (state, exception) => ((HostingRequestFinished)state).ToString();
private readonly HttpContext _httpContext; private readonly HttpContext _httpContext;
private readonly TimeSpan _elapsed; private readonly TimeSpan _elapsed;
private IEnumerable<KeyValuePair<string, object>> _cachedGetValues;
private string _cachedToString; private string _cachedToString;
public int Count
{
get
{
return 3;
}
}
public KeyValuePair<string, object> this[int index]
{
get
{
switch (index)
{
case 0:
return new KeyValuePair<string, object>("ElapsedMilliseconds", _elapsed.TotalMilliseconds);
case 1:
return new KeyValuePair<string, object>("StatusCode", _httpContext.Response.StatusCode);
case 2:
return new KeyValuePair<string, object>("ContentType", _httpContext.Response.ContentType);
default:
throw new IndexOutOfRangeException(nameof(index));
}
}
}
public HostingRequestFinished(HttpContext httpContext, TimeSpan elapsed) public HostingRequestFinished(HttpContext httpContext, TimeSpan elapsed)
{ {
_httpContext = httpContext; _httpContext = httpContext;
@ -195,19 +272,17 @@ namespace Microsoft.AspNetCore.Hosting.Internal
return _cachedToString; return _cachedToString;
} }
public IEnumerable<KeyValuePair<string, object>> GetValues() public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
{ {
if (_cachedGetValues == null) for (int i = 0; i < Count; ++i)
{ {
_cachedGetValues = new[] yield return this[i];
{
new KeyValuePair<string, object>("ElapsedMilliseconds", _elapsed.TotalMilliseconds),
new KeyValuePair<string, object>("StatusCode", _httpContext.Response.StatusCode),
new KeyValuePair<string, object>("ContentType", _httpContext.Response.ContentType),
};
} }
}
return _cachedGetValues; IEnumerator IEnumerable.GetEnumerator()
{
return GetEnumerator();
} }
} }
} }

2
src/Microsoft.AspNetCore.Server.Testing/Common/RetryHelper.cs
View File

@ -51,7 +51,7 @@ namespace Microsoft.AspNetCore.Server.Testing
{ {
if (retry == retryCount - 1) if (retry == retryCount - 1)
{ {
logger.LogError("Failed to connect, retry limit exceeded.", exception); logger.LogError(0, exception, "Failed to connect, retry limit exceeded.");
throw; throw;
} }
else else

2
test/Microsoft.AspNetCore.Hosting.Tests/WebHostTests.cs
View File

@ -611,7 +611,7 @@ namespace Microsoft.AspNetCore.Hosting
var stringified = state.ToString(); var stringified = state.ToString();
return this; return this;
} }
public void Log(LogLevel logLevel, int eventId, object state, Exception exception, Func<object, Exception, string> formatter) public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
{ {
var stringified = formatter(state, exception); var stringified = formatter(state, exception);
} }

2
test/Microsoft.AspNetCore.TestHost.Tests/ClientHandlerTests.cs
View File

@ -308,7 +308,7 @@ namespace Microsoft.AspNetCore.TestHost
public bool IsEnabled(LogLevel logLevel) => true; public bool IsEnabled(LogLevel logLevel) => true;
// This call verifies that fields of HttpRequest are accessed and valid // This call verifies that fields of HttpRequest are accessed and valid
public void Log(LogLevel logLevel, int eventId, object state, Exception exception, Func<object, Exception, string> formatter) => formatter(state, exception); public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter) => formatter(state, exception);
class NoopDispoasble : IDisposable class NoopDispoasble : IDisposable
{ {

2
test/Microsoft.AspNetCore.TestHost.Tests/TestClientTests.cs
View File

@ -204,7 +204,7 @@ namespace Microsoft.AspNetCore.TestHost
public bool IsEnabled(LogLevel logLevel) => true; public bool IsEnabled(LogLevel logLevel) => true;
// This call verifies that fields of HttpRequest are accessed and valid // This call verifies that fields of HttpRequest are accessed and valid
public void Log(LogLevel logLevel, int eventId, object state, Exception exception, Func<object, Exception, string> formatter) => formatter(state, exception); public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter) => formatter(state, exception);
class NoopDispoasble : IDisposable class NoopDispoasble : IDisposable
{ {