From d4e844dfcd3a547083da814db22c35cf7fd4cd93 Mon Sep 17 00:00:00 2001 From: sta Date: Thu, 12 Feb 2015 16:54:38 +0900 Subject: [PATCH] Added Log property to the HttpListenerWebSocketContext class --- .../Net/WebSockets/HttpListenerWebSocketContext.cs | 8 +++++++- websocket-sharp/WebSocket.cs | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/websocket-sharp/Net/WebSockets/HttpListenerWebSocketContext.cs b/websocket-sharp/Net/WebSockets/HttpListenerWebSocketContext.cs index cc885340..f89e8962 100644 --- a/websocket-sharp/Net/WebSockets/HttpListenerWebSocketContext.cs +++ b/websocket-sharp/Net/WebSockets/HttpListenerWebSocketContext.cs @@ -52,13 +52,19 @@ namespace WebSocketSharp.Net.WebSockets internal HttpListenerWebSocketContext (HttpListenerContext context, string protocol) { _context = context; - _websocket = new WebSocket (this, protocol, context.Listener.Log); + _websocket = new WebSocket (this, protocol); } #endregion #region Internal Properties + internal Logger Log { + get { + return _context.Listener.Log; + } + } + internal Stream Stream { get { return _context.Connection.Stream; diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index ad7f0bd3..f36c6d57 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -116,13 +116,13 @@ namespace WebSocketSharp #region Internal Constructors // As server - internal WebSocket (HttpListenerWebSocketContext context, string protocol, Logger logger) + internal WebSocket (HttpListenerWebSocketContext context, string protocol) { _context = context; _protocol = protocol; - _logger = logger; _closeContext = context.Close; + _logger = context.Log; _secure = context.IsSecureConnection; _stream = context.Stream; _waitTime = TimeSpan.FromSeconds (1);