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

Fixes #597: Hosting logging needs to use structured logging instead of format strings

This commit is contained in:
Kiran Challa 2016-02-03 10:10:25 -08:00
parent 2d88b9957d
commit 906ed5f0fb
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Globalization;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -126,7 +127,11 @@ namespace Microsoft.AspNetCore.Hosting.Internal
{ {
if (_cachedToString == null) if (_cachedToString == null)
{ {
_cachedToString = $"RequestId:{_httpContext.TraceIdentifier} RequestPath:{_httpContext.Request.Path}"; _cachedToString = string.Format(
CultureInfo.InvariantCulture,
"RequestId:{0} RequestPath:{1}",
_httpContext.TraceIdentifier,
_httpContext.Request.Path);
} }
return _cachedToString; return _cachedToString;
@ -201,7 +206,18 @@ namespace Microsoft.AspNetCore.Hosting.Internal
{ {
if (_cachedToString == null) if (_cachedToString == null)
{ {
_cachedToString = $"Request starting {_request.Protocol} {_request.Method} {_request.Scheme}://{_request.Host}{_request.PathBase}{_request.Path}{_request.QueryString} {_request.ContentType} {_request.ContentLength}"; _cachedToString = string.Format(
CultureInfo.InvariantCulture,
"Request starting {0} {1} {2}://{3}{4}{5}{6} {7} {8}",
_request.Protocol,
_request.Method,
_request.Scheme,
_request.Host,
_request.PathBase,
_request.Path,
_request.QueryString,
_request.ContentType,
_request.ContentLength);
} }
return _cachedToString; return _cachedToString;
@ -227,7 +243,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal
private readonly HttpContext _httpContext; private readonly HttpContext _httpContext;
private readonly TimeSpan _elapsed; private readonly TimeSpan _elapsed;
private string _cachedToString; private string _cachedToString;
public int Count public int Count
@ -266,7 +282,12 @@ namespace Microsoft.AspNetCore.Hosting.Internal
{ {
if (_cachedToString == null) if (_cachedToString == null)
{ {
_cachedToString = $"Request finished in {_elapsed.TotalMilliseconds}ms {_httpContext.Response.StatusCode} {_httpContext.Response.ContentType}"; _cachedToString = string.Format(
CultureInfo.InvariantCulture,
"Request finished in {0}ms {1} {2}",
_elapsed.TotalMilliseconds,
_httpContext.Response.StatusCode,
_httpContext.Response.ContentType);
} }
return _cachedToString; return _cachedToString;