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

Remove request and response logging which has been added in the Hosting layer

This commit is contained in:
John Luo 2016-01-22 11:10:17 -08:00
parent 1aff2e9cda
commit b4eacceb42
3 changed files with 0 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/Microsoft.Net.Http.Server/RequestProcessing/HeadersLogStructure.cs
View File

@ -1,42 +0,0 @@
// Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// THIS CODE IS PROVIDED *AS IS* BASIS, WITHOUT WARRANTIES OR
// CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING
// WITHOUT LIMITATION ANY IMPLIED WARRANTIES OR CONDITIONS OF
// TITLE, FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABLITY OR
// NON-INFRINGEMENT.
// See the Apache 2 License for the specific language governing
// permissions and limitations under the License.
using System.Collections;
namespace Microsoft.Net.Http.Server
{
internal class HeadersLogStructure : IEnumerable
{
private readonly HeaderCollection _headers;
internal HeadersLogStructure(HeaderCollection headers)
{
_headers = headers;
}
IEnumerator IEnumerable.GetEnumerator()
{
foreach (var header in _headers)
{
foreach (var value in header.Value)
{
yield return header.Key + ": " + value;
}
}
}
}
}

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

@ -150,11 +150,6 @@ namespace Microsoft.Net.Http.Server
GetTlsTokenBindingInfo(); GetTlsTokenBindingInfo();
// TODO: Verbose log parameters // TODO: Verbose log parameters
if (_requestContext.Logger.IsEnabled(LogLevel.Debug))
{
RequestContext.Logger.LogDebug(new ReceiveRequestLogContext(this));
}
} }
internal SslStatus SslStatus internal SslStatus SslStatus
@ -533,63 +528,5 @@ namespace Microsoft.Net.Http.Server
_nativeStream = new RequestStream(RequestContext); _nativeStream = new RequestStream(RequestContext);
} }
} }
private class ReceiveRequestLogContext : ILogValues
{
private readonly Request _request;
internal ReceiveRequestLogContext(Request request)
{
_request = request;
}
public string Method { get { return _request.Method; } }
public string PathBase { get { return _request.PathBase; } }
public string Path { get { return _request.Path; } }
public string Query { get { return _request.QueryString; } }
public string Protocol { get { return "HTTP/" + _request.ProtocolVersion.ToString(2); } }
public IEnumerable Headers { get { return new HeadersLogStructure(_request.Headers); } }
public IEnumerable<KeyValuePair<string, object>> GetValues()
{
return new[]
{
new KeyValuePair<string, object>("Method", Method),
new KeyValuePair<string, object>("PathBase", PathBase),
new KeyValuePair<string, object>("Path", Path),
new KeyValuePair<string, object>("Query", Query),
new KeyValuePair<string, object>("Protocol", Protocol),
new KeyValuePair<string, object>("Headers", Headers),
};
}
public override string ToString()
{
var requestBuilder = new StringBuilder("Received request: ");
// GET /path?query HTTP/1.1
requestBuilder.Append(Method);
requestBuilder.Append(" ");
requestBuilder.Append(PathBase);
requestBuilder.Append(Path);
requestBuilder.Append(Query);
requestBuilder.Append(" ");
requestBuilder.Append(Protocol);
requestBuilder.Append("; Headers: { ");
foreach (var header in _request.Headers)
{
foreach (var value in header.Value)
{
requestBuilder.Append(header.Key);
requestBuilder.Append(": ");
requestBuilder.Append(value);
requestBuilder.Append("; ");
}
}
requestBuilder.Append("}");
return requestBuilder.ToString();
}
}
} }
} }

56
src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs
View File

@ -356,11 +356,6 @@ namespace Microsoft.Net.Http.Server
_responseState = ResponseState.StartedSending; _responseState = ResponseState.StartedSending;
var reasonPhrase = GetReasonPhrase(StatusCode); var reasonPhrase = GetReasonPhrase(StatusCode);
if (RequestContext.Logger.IsEnabled(LogLevel.Debug))
{
RequestContext.Logger.LogDebug(new SendResponseLogContext(this));
}
/* /*
if (m_BoundaryType==BoundaryType.Raw) { if (m_BoundaryType==BoundaryType.Raw) {
use HTTP_SEND_RESPONSE_FLAG_RAW_HEADER; use HTTP_SEND_RESPONSE_FLAG_RAW_HEADER;
@ -823,56 +818,5 @@ namespace Microsoft.Net.Http.Server
} }
} }
} }
private class SendResponseLogContext : ILogValues
{
private readonly Response _response;
internal SendResponseLogContext(Response response)
{
_response = response;
}
public string Protocol { get { return "HTTP/1.1"; } } // HTTP.SYS only allows 1.1 responses.
public string StatusCode { get { return _response.StatusCode.ToString(CultureInfo.InvariantCulture); } }
public string ReasonPhrase { get { return _response.ReasonPhrase ?? _response.GetReasonPhrase(_response.StatusCode); } }
public IEnumerable Headers { get { return new HeadersLogStructure(_response.Headers); } }
public IEnumerable<KeyValuePair<string, object>> GetValues()
{
return new[]
{
new KeyValuePair<string, object>("Protocol", Protocol),
new KeyValuePair<string, object>("StatusCode", StatusCode),
new KeyValuePair<string, object>("ReasonPhrase", ReasonPhrase),
new KeyValuePair<string, object>("Headers", Headers),
};
}
public override string ToString()
{
// HTTP/1.1 200 OK
var responseBuilder = new StringBuilder("Sending Response: ");
responseBuilder.Append(Protocol);
responseBuilder.Append(" ");
responseBuilder.Append(StatusCode);
responseBuilder.Append(" ");
responseBuilder.Append(ReasonPhrase);
responseBuilder.Append("; Headers: { ");
foreach (var header in _response.Headers)
{
foreach (var value in header.Value)
{
responseBuilder.Append(header.Key);
responseBuilder.Append(": ");
responseBuilder.Append(value);
responseBuilder.Append("; ");
}
}
responseBuilder.Append("}");
return responseBuilder.ToString();
}
}
} }
} }