DevWiki/websocket-sharp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed WebSocketServiceHostManager.cs to WebSocketServiceManager.cs

Browse Source
This commit is contained in:
sta 2014-02-13 16:09:16 +09:00
parent d07265dd8e
commit 353e481f95
4 changed files with 42 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
websocket-sharp/Server/HttpServer.cs
View File

@ -64,7 +64,7 @@ namespace WebSocketSharp.Server
private Thread _receiveRequestThread; private Thread _receiveRequestThread;
private string _rootPath; private string _rootPath;
private bool _secure; private bool _secure;
private WebSocketServiceHostManager _serviceHosts; private WebSocketServiceManager _services;
private volatile ServerState _state; private volatile ServerState _state;
private object _sync; private object _sync;
private bool _windows; private bool _windows;
@ -146,7 +146,7 @@ namespace WebSocketSharp.Server
_secure = secure; _secure = secure;
_listener = new HttpListener (); _listener = new HttpListener ();
_logger = new Logger (); _logger = new Logger ();
_serviceHosts = new WebSocketServiceHostManager (_logger); _services = new WebSocketServiceManager (_logger);
_state = ServerState.READY; _state = ServerState.READY;
_sync = new object (); _sync = new object ();
@ -242,11 +242,11 @@ namespace WebSocketSharp.Server
/// </value> /// </value>
public bool KeepClean { public bool KeepClean {
get { get {
return _serviceHosts.KeepClean; return _services.KeepClean;
} }
set { set {
_serviceHosts.KeepClean = value; _services.KeepClean = value;
} }
} }
@ -345,16 +345,14 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Gets the access to the WebSocket services provided by the /// Gets the access to the WebSocket services provided by the <see cref="HttpServer"/>.
/// <see cref="HttpServer"/>.
/// </summary> /// </summary>
/// <value> /// <value>
/// A <see cref="WebSocketServiceHostManager"/> that manages the WebSocket /// A <see cref="WebSocketServiceManager"/> that manages the WebSocket services.
/// services.
/// </value> /// </value>
public WebSocketServiceHostManager WebSocketServices { public WebSocketServiceManager WebSocketServices {
get { get {
return _serviceHosts; return _services;
} }
} }
@ -420,7 +418,7 @@ namespace WebSocketSharp.Server
_state = ServerState.SHUTDOWN; _state = ServerState.SHUTDOWN;
} }
_serviceHosts.Stop ( _services.Stop (
((ushort) CloseStatusCode.SERVER_ERROR).ToByteArrayInternally (ByteOrder.BIG), ((ushort) CloseStatusCode.SERVER_ERROR).ToByteArrayInternally (ByteOrder.BIG),
true); true);
_listener.Abort (); _listener.Abort ();
@ -522,7 +520,7 @@ namespace WebSocketSharp.Server
WebSocketServiceHost host; WebSocketServiceHost host;
if (path == null || if (path == null ||
!_serviceHosts.TryGetServiceHostInternally (path, out host)) { !_services.TryGetServiceHostInternally (path, out host)) {
context.Close (HttpStatusCode.NotImplemented); context.Close (HttpStatusCode.NotImplemented);
return; return;
} }
@ -683,7 +681,7 @@ namespace WebSocketSharp.Server
if (!KeepClean) if (!KeepClean)
host.KeepClean = false; host.KeepClean = false;
_serviceHosts.Add (host.ServicePath, host); _services.Add (host.ServicePath, host);
} }
/// <summary> /// <summary>
@ -733,7 +731,7 @@ namespace WebSocketSharp.Server
return false; return false;
} }
return _serviceHosts.Remove (servicePath); return _services.Remove (servicePath);
} }
/// <summary> /// <summary>
@ -751,7 +749,7 @@ namespace WebSocketSharp.Server
return; return;
} }
_serviceHosts.Start (); _services.Start ();
_listener.Start (); _listener.Start ();
startReceiving (); startReceiving ();
@ -774,7 +772,7 @@ namespace WebSocketSharp.Server
_state = ServerState.SHUTDOWN; _state = ServerState.SHUTDOWN;
} }
_serviceHosts.Stop (new byte [0], true); _services.Stop (new byte [0], true);
stopListener (5000); stopListener (5000);
_state = ServerState.STOP; _state = ServerState.STOP;
@ -810,7 +808,7 @@ namespace WebSocketSharp.Server
_state = ServerState.SHUTDOWN; _state = ServerState.SHUTDOWN;
} }
_serviceHosts.Stop (data, !code.IsReserved ()); _services.Stop (data, !code.IsReserved ());
stopListener (5000); stopListener (5000);
_state = ServerState.STOP; _state = ServerState.STOP;
@ -844,7 +842,7 @@ namespace WebSocketSharp.Server
_state = ServerState.SHUTDOWN; _state = ServerState.SHUTDOWN;
} }
_serviceHosts.Stop (data, !code.IsReserved ()); _services.Stop (data, !code.IsReserved ());
stopListener (5000); stopListener (5000);
_state = ServerState.STOP; _state = ServerState.STOP;

34
websocket-sharp/Server/WebSocketServer.cs
View File

@ -67,7 +67,7 @@ namespace WebSocketSharp.Server
private string _realm; private string _realm;
private Thread _receiveRequestThread; private Thread _receiveRequestThread;
private bool _secure; private bool _secure;
private WebSocketServiceHostManager _serviceHosts; private WebSocketServiceManager _services;
private volatile ServerState _state; private volatile ServerState _state;
private object _sync; private object _sync;
private Uri _uri; private Uri _uri;
@ -375,11 +375,11 @@ namespace WebSocketSharp.Server
/// </value> /// </value>
public bool KeepClean { public bool KeepClean {
get { get {
return _serviceHosts.KeepClean; return _services.KeepClean;
} }
set { set {
_serviceHosts.KeepClean = value; _services.KeepClean = value;
} }
} }
@ -456,16 +456,14 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Gets the access to the WebSocket services provided by the /// Gets the access to the WebSocket services provided by the <see cref="WebSocketServer"/>.
/// <see cref="WebSocketServer"/>.
/// </summary> /// </summary>
/// <value> /// <value>
/// A <see cref="WebSocketServiceHostManager"/> that manages the WebSocket /// A <see cref="WebSocketServiceManager"/> that manages the WebSocket services.
/// services.
/// </value> /// </value>
public WebSocketServiceHostManager WebSocketServices { public WebSocketServiceManager WebSocketServices {
get { get {
return _serviceHosts; return _services;
} }
} }
@ -483,7 +481,7 @@ namespace WebSocketSharp.Server
} }
_listener.Stop (); _listener.Stop ();
_serviceHosts.Stop ( _services.Stop (
((ushort) CloseStatusCode.SERVER_ERROR).ToByteArrayInternally (ByteOrder.BIG), ((ushort) CloseStatusCode.SERVER_ERROR).ToByteArrayInternally (ByteOrder.BIG),
true); true);
@ -515,7 +513,7 @@ namespace WebSocketSharp.Server
WebSocketServiceHost host; WebSocketServiceHost host;
if (path == null || if (path == null ||
!_serviceHosts.TryGetServiceHostInternally (path, out host)) { !_services.TryGetServiceHostInternally (path, out host)) {
context.Close (HttpStatusCode.NotImplemented); context.Close (HttpStatusCode.NotImplemented);
return; return;
} }
@ -596,7 +594,7 @@ namespace WebSocketSharp.Server
_authSchemes = AuthenticationSchemes.Anonymous; _authSchemes = AuthenticationSchemes.Anonymous;
_listener = new TcpListener (_address, _port); _listener = new TcpListener (_address, _port);
_logger = new Logger (); _logger = new Logger ();
_serviceHosts = new WebSocketServiceHostManager (_logger); _services = new WebSocketServiceManager (_logger);
_state = ServerState.READY; _state = ServerState.READY;
_sync = new object (); _sync = new object ();
} }
@ -728,7 +726,7 @@ namespace WebSocketSharp.Server
if (!KeepClean) if (!KeepClean)
host.KeepClean = false; host.KeepClean = false;
_serviceHosts.Add (host.ServicePath, host); _services.Add (host.ServicePath, host);
} }
/// <summary> /// <summary>
@ -757,7 +755,7 @@ namespace WebSocketSharp.Server
return false; return false;
} }
return _serviceHosts.Remove (servicePath); return _services.Remove (servicePath);
} }
/// <summary> /// <summary>
@ -775,7 +773,7 @@ namespace WebSocketSharp.Server
return; return;
} }
_serviceHosts.Start (); _services.Start ();
_listener.Start (); _listener.Start ();
startReceiving (); startReceiving ();
@ -799,7 +797,7 @@ namespace WebSocketSharp.Server
} }
stopListener (5000); stopListener (5000);
_serviceHosts.Stop (new byte [0], true); _services.Stop (new byte [0], true);
_state = ServerState.STOP; _state = ServerState.STOP;
} }
@ -835,7 +833,7 @@ namespace WebSocketSharp.Server
} }
stopListener (5000); stopListener (5000);
_serviceHosts.Stop (data, !code.IsReserved ()); _services.Stop (data, !code.IsReserved ());
_state = ServerState.STOP; _state = ServerState.STOP;
} }
@ -869,7 +867,7 @@ namespace WebSocketSharp.Server
} }
stopListener (5000); stopListener (5000);
_serviceHosts.Stop (data, !code.IsReserved ()); _services.Stop (data, !code.IsReserved ());
_state = ServerState.STOP; _state = ServerState.STOP;
} }

17
websocket-sharp/Server/WebSocketServiceHostManager.cs → websocket-sharp/Server/WebSocketServiceManager.cs
View File

@ -1,6 +1,6 @@
#region License #region License
/* /*
* WebSocketServiceHostManager.cs * WebSocketServiceManager.cs
* *
* The MIT License * The MIT License
* *
@ -39,7 +39,7 @@ namespace WebSocketSharp.Server
/// Manages the WebSocket services provided by the <see cref="HttpServer"/> or /// Manages the WebSocket services provided by the <see cref="HttpServer"/> or
/// <see cref="WebSocketServer"/>. /// <see cref="WebSocketServer"/>.
/// </summary> /// </summary>
public class WebSocketServiceHostManager public class WebSocketServiceManager
{ {
#region Private Fields #region Private Fields
@ -53,14 +53,15 @@ namespace WebSocketSharp.Server
#region Internal Constructors #region Internal Constructors
internal WebSocketServiceHostManager () internal WebSocketServiceManager ()
: this (new Logger ()) : this (new Logger ())
{ {
} }
internal WebSocketServiceHostManager (Logger logger) internal WebSocketServiceManager (Logger logger)
{ {
_logger = logger; _logger = logger;
_hosts = new Dictionary<string, WebSocketServiceHost> (); _hosts = new Dictionary<string, WebSocketServiceHost> ();
_keepClean = true; _keepClean = true;
_state = ServerState.READY; _state = ServerState.READY;
@ -118,8 +119,8 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Gets a value indicating whether the manager cleans up periodically the inactive sessions in /// Gets a value indicating whether the manager cleans up the inactive sessions in the
/// the WebSocket services provided by the server. /// WebSocket services provided by the server periodically.
/// </summary> /// </summary>
/// <value> /// <value>
/// <c>true</c> if the manager cleans up the inactive sessions every 60 seconds; otherwise, /// <c>true</c> if the manager cleans up the inactive sessions every 60 seconds; otherwise,
@ -156,10 +157,10 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Gets the number of the WebSocket sessions in the server. /// Gets the number of the sessions in the WebSocket services provided by the server.
/// </summary> /// </summary>
/// <value> /// <value>
/// An <see cref="int"/> that represents the number of the sessions in the server. /// An <see cref="int"/> that represents the number of the sessions.
/// </value> /// </value>
public int SessionCount { public int SessionCount {
get { get {

2
websocket-sharp/websocket-sharp.csproj
View File

@ -122,7 +122,6 @@
<Compile Include="HandshakeBase.cs" /> <Compile Include="HandshakeBase.cs" />
<Compile Include="HandshakeRequest.cs" /> <Compile Include="HandshakeRequest.cs" />
<Compile Include="HandshakeResponse.cs" /> <Compile Include="HandshakeResponse.cs" />
<Compile Include="Server\WebSocketServiceHostManager.cs" />
<Compile Include="WebSocketState.cs" /> <Compile Include="WebSocketState.cs" />
<Compile Include="Server\IWebSocketSession.cs" /> <Compile Include="Server\IWebSocketSession.cs" />
<Compile Include="Server\WebSocketSessionManager.cs" /> <Compile Include="Server\WebSocketSessionManager.cs" />
@ -130,6 +129,7 @@
<Compile Include="Net\HttpBasicIdentity.cs" /> <Compile Include="Net\HttpBasicIdentity.cs" />
<Compile Include="Net\HttpDigestIdentity.cs" /> <Compile Include="Net\HttpDigestIdentity.cs" />
<Compile Include="Net\NetworkCredential.cs" /> <Compile Include="Net\NetworkCredential.cs" />
<Compile Include="Server\WebSocketServiceManager.cs" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup> <ItemGroup>