Added Log property to the TcpListenerWebSocketContext class

This commit is contained in:
sta 2015-02-11 18:00:17 +09:00
parent 14c419fc17
commit e989e3e18f
2 changed files with 11 additions and 3 deletions

View File

@ -54,6 +54,7 @@ namespace WebSocketSharp.Net.WebSockets
#region Private Fields #region Private Fields
private CookieCollection _cookies; private CookieCollection _cookies;
private Logger _logger;
private NameValueCollection _queryString; private NameValueCollection _queryString;
private HttpRequest _request; private HttpRequest _request;
private bool _secure; private bool _secure;
@ -76,6 +77,7 @@ namespace WebSocketSharp.Net.WebSockets
{ {
_tcpClient = tcpClient; _tcpClient = tcpClient;
_secure = secure; _secure = secure;
_logger = logger;
var netStream = tcpClient.GetStream (); var netStream = tcpClient.GetStream ();
if (secure) { if (secure) {
@ -98,7 +100,7 @@ namespace WebSocketSharp.Net.WebSockets
_uri = HttpUtility.CreateRequestUrl ( _uri = HttpUtility.CreateRequestUrl (
_request.RequestUri, _request.Headers["Host"], _request.IsWebSocketRequest, secure); _request.RequestUri, _request.Headers["Host"], _request.IsWebSocketRequest, secure);
_websocket = new WebSocket (this, protocol, logger); _websocket = new WebSocket (this, protocol);
} }
#endregion #endregion
@ -111,6 +113,12 @@ namespace WebSocketSharp.Net.WebSockets
} }
} }
internal Logger Log {
get {
return _logger;
}
}
internal Stream Stream { internal Stream Stream {
get { get {
return _stream; return _stream;

View File

@ -131,13 +131,13 @@ namespace WebSocketSharp
} }
// As server // As server
internal WebSocket (TcpListenerWebSocketContext context, string protocol, Logger logger) internal WebSocket (TcpListenerWebSocketContext context, string protocol)
{ {
_context = context; _context = context;
_protocol = protocol; _protocol = protocol;
_logger = logger;
_closeContext = context.Close; _closeContext = context.Close;
_logger = context.Log;
_secure = context.IsSecureConnection; _secure = context.IsSecureConnection;
_stream = context.Stream; _stream = context.Stream;
_waitTime = TimeSpan.FromSeconds (1); _waitTime = TimeSpan.FromSeconds (1);