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

Enable logging in RequestUriBuilder (#169).

This commit is contained in:
Cesar Blum Silveira 2015-12-30 13:46:08 -08:00
parent 17615bef89
commit 1b76152b5c
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.Net.Http.Server/LogHelper.cs
View File

@ -51,7 +51,7 @@ namespace Microsoft.Net.Http.Server
} }
} }
internal static void LogDebug(ILogger logger, string data) internal static void LogDebug(ILogger logger, string location, string data)
{ {
if (logger == null) if (logger == null)
{ {
@ -59,7 +59,7 @@ namespace Microsoft.Net.Http.Server
} }
else else
{ {
logger.LogDebug(data); logger.LogDebug(location + "; " + data);
} }
} }

2
src/Microsoft.Net.Http.Server/RequestProcessing/Request.cs
View File

@ -391,7 +391,7 @@ namespace Microsoft.Net.Http.Server
{ {
get get
{ {
return RequestUriBuilder.GetRequestPath(_rawUrl, _cookedUrlPath); return RequestUriBuilder.GetRequestPath(_rawUrl, _cookedUrlPath, RequestContext.Logger);
} }
} }

20
src/Microsoft.Net.Http.Server/RequestProcessing/RequestUriBuilder.cs
View File

@ -26,6 +26,7 @@ using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Globalization; using System.Globalization;
using System.Text; using System.Text;
using Microsoft.Extensions.Logging;
namespace Microsoft.Net.Http.Server namespace Microsoft.Net.Http.Server
{ {
@ -52,18 +53,22 @@ namespace Microsoft.Net.Http.Server
private List<byte> _rawOctets; private List<byte> _rawOctets;
private string _rawPath; private string _rawPath;
private ILogger _logger;
static RequestUriBuilder() static RequestUriBuilder()
{ {
Utf8Encoding = new UTF8Encoding(false, true); Utf8Encoding = new UTF8Encoding(false, true);
} }
private RequestUriBuilder(string rawUri, string cookedUriPath) private RequestUriBuilder(string rawUri, string cookedUriPath, ILogger logger)
{ {
Debug.Assert(!string.IsNullOrEmpty(rawUri), "Empty raw URL."); Debug.Assert(!string.IsNullOrEmpty(rawUri), "Empty raw URL.");
Debug.Assert(!string.IsNullOrEmpty(cookedUriPath), "Empty cooked URL path."); Debug.Assert(!string.IsNullOrEmpty(cookedUriPath), "Empty cooked URL path.");
Debug.Assert(logger != null, "Null logger.");
this._rawUri = rawUri; this._rawUri = rawUri;
this._cookedUriPath = AddSlashToAsteriskOnlyPath(cookedUriPath); this._cookedUriPath = AddSlashToAsteriskOnlyPath(cookedUriPath);
this._logger = logger;
} }
private enum ParsingResult private enum ParsingResult
@ -74,9 +79,9 @@ namespace Microsoft.Net.Http.Server
} }
// Process only the path. // Process only the path.
internal static string GetRequestPath(string rawUri, string cookedUriPath) internal static string GetRequestPath(string rawUri, string cookedUriPath, ILogger logger)
{ {
RequestUriBuilder builder = new RequestUriBuilder(rawUri, cookedUriPath); RequestUriBuilder builder = new RequestUriBuilder(rawUri, cookedUriPath, logger);
return builder.GetPath(); return builder.GetPath();
} }
@ -167,7 +172,7 @@ namespace Microsoft.Net.Http.Server
byte encodedValue; byte encodedValue;
if (!byte.TryParse(escapedCharacter, NumberStyles.HexNumber, null, out encodedValue)) if (!byte.TryParse(escapedCharacter, NumberStyles.HexNumber, null, out encodedValue))
{ {
LogWarning(nameof(AddPercentEncodedOctetToRawOctetsList), "Can't convert code point: " + escapedCharacter); LogHelper.LogDebug(_logger, nameof(AddPercentEncodedOctetToRawOctetsList), "Can't convert code point: " + escapedCharacter);
return false; return false;
} }
@ -198,7 +203,7 @@ namespace Microsoft.Net.Http.Server
} }
catch (DecoderFallbackException e) catch (DecoderFallbackException e)
{ {
LogWarning(nameof(EmptyDecodeAndAppendDecodedOctetsList), "Can't convert bytes: " + GetOctetsAsString(_rawOctets), e.Message); LogHelper.LogDebug(_logger, nameof(EmptyDecodeAndAppendDecodedOctetsList), "Can't convert bytes: " + GetOctetsAsString(_rawOctets) + ": " + e.Message);
} }
return false; return false;
@ -307,10 +312,5 @@ namespace Microsoft.Net.Http.Server
return path; return path;
} }
private void LogWarning(string methodName, string message, params object[] args)
{
// TODO: Verbose log
}
} }
} }