From e989e3e18fd0dfbb0a5822c5d0b8cff46962e9d0 Mon Sep 17 00:00:00 2001
From: sta <sta.blockhead@gmail.com>
Date: Wed, 11 Feb 2015 18:00:17 +0900
Subject: [PATCH] Added Log property to the TcpListenerWebSocketContext class

---
 .../Net/WebSockets/TcpListenerWebSocketContext.cs      | 10 +++++++++-
 websocket-sharp/WebSocket.cs                           |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs b/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
index 80c9daf1..9def9f3d 100644
--- a/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
+++ b/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
@@ -54,6 +54,7 @@ namespace WebSocketSharp.Net.WebSockets
     #region Private Fields
 
     private CookieCollection    _cookies;
+    private Logger              _logger;
     private NameValueCollection _queryString;
     private HttpRequest         _request;
     private bool                _secure;
@@ -76,6 +77,7 @@ namespace WebSocketSharp.Net.WebSockets
     {
       _tcpClient = tcpClient;
       _secure = secure;
+      _logger = logger;
 
       var netStream = tcpClient.GetStream ();
       if (secure) {
@@ -98,7 +100,7 @@ namespace WebSocketSharp.Net.WebSockets
       _uri = HttpUtility.CreateRequestUrl (
         _request.RequestUri, _request.Headers["Host"], _request.IsWebSocketRequest, secure);
 
-      _websocket = new WebSocket (this, protocol, logger);
+      _websocket = new WebSocket (this, protocol);
     }
 
     #endregion
@@ -111,6 +113,12 @@ namespace WebSocketSharp.Net.WebSockets
       }
     }
 
+    internal Logger Log {
+      get {
+        return _logger;
+      }
+    }
+
     internal Stream Stream {
       get {
         return _stream;
diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs
index 79647a5b..ad7f0bd3 100644
--- a/websocket-sharp/WebSocket.cs
+++ b/websocket-sharp/WebSocket.cs
@@ -131,13 +131,13 @@ namespace WebSocketSharp
     }
 
     // As server
-    internal WebSocket (TcpListenerWebSocketContext context, string protocol, Logger logger)
+    internal WebSocket (TcpListenerWebSocketContext 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);