diff --git a/src/Microsoft.Net.Http.Server/RequestProcessing/HeadersLogStructure.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/HeadersLogStructure.cs deleted file mode 100644 index 26c182df2a..0000000000 --- a/src/Microsoft.Net.Http.Server/RequestProcessing/HeadersLogStructure.cs +++ /dev/null @@ -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; - } - } - } - } -} \ No newline at end of file diff --git a/src/Microsoft.Net.Http.Server/RequestProcessing/Request.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/Request.cs index 5ffebdfb8b..27904ede12 100644 --- a/src/Microsoft.Net.Http.Server/RequestProcessing/Request.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/Request.cs @@ -150,11 +150,6 @@ namespace Microsoft.Net.Http.Server GetTlsTokenBindingInfo(); // TODO: Verbose log parameters - - if (_requestContext.Logger.IsEnabled(LogLevel.Debug)) - { - RequestContext.Logger.LogDebug(new ReceiveRequestLogContext(this)); - } } internal SslStatus SslStatus @@ -533,63 +528,5 @@ namespace Microsoft.Net.Http.Server _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> GetValues() - { - return new[] - { - new KeyValuePair("Method", Method), - new KeyValuePair("PathBase", PathBase), - new KeyValuePair("Path", Path), - new KeyValuePair("Query", Query), - new KeyValuePair("Protocol", Protocol), - new KeyValuePair("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(); - } - } } } diff --git a/src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs index 668ba5ae42..c7780b6b90 100644 --- a/src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs @@ -356,11 +356,6 @@ namespace Microsoft.Net.Http.Server _responseState = ResponseState.StartedSending; var reasonPhrase = GetReasonPhrase(StatusCode); - if (RequestContext.Logger.IsEnabled(LogLevel.Debug)) - { - RequestContext.Logger.LogDebug(new SendResponseLogContext(this)); - } - /* if (m_BoundaryType==BoundaryType.Raw) { 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> GetValues() - { - return new[] - { - new KeyValuePair("Protocol", Protocol), - new KeyValuePair("StatusCode", StatusCode), - new KeyValuePair("ReasonPhrase", ReasonPhrase), - new KeyValuePair("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(); - } - } } }