Refactored WebSocketServer.cs

This commit is contained in:
sta 2014-02-14 15:10:59 +09:00
parent 353e481f95
commit a96a6f2226

View File

@ -80,8 +80,8 @@ namespace WebSocketSharp.Server
/// Initializes a new instance of the <see cref="WebSocketServer"/> class. /// Initializes a new instance of the <see cref="WebSocketServer"/> class.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// An instance initialized by this constructor listens for the incoming /// An instance initialized by this constructor listens for the incoming connection requests on
/// connection requests on port 80. /// port 80.
/// </remarks> /// </remarks>
public WebSocketServer () public WebSocketServer ()
: this (80) : this (80)
@ -89,17 +89,16 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="WebSocketServer"/> class /// Initializes a new instance of the <see cref="WebSocketServer"/> class with the specified
/// with the specified <paramref name="port"/>. /// <paramref name="port"/>.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// <para> /// <para>
/// An instance initialized by this constructor listens for the incoming /// An instance initialized by this constructor listens for the incoming connection requests
/// connection requests on <paramref name="port"/>. /// on <paramref name="port"/>.
/// </para> /// </para>
/// <para> /// <para>
/// And if <paramref name="port"/> is 443, that instance provides a secure /// And if <paramref name="port"/> is 443, that instance provides a secure connection.
/// connection.
/// </para> /// </para>
/// </remarks> /// </remarks>
/// <param name="port"> /// <param name="port">
@ -114,18 +113,18 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="WebSocketServer"/> class /// Initializes a new instance of the <see cref="WebSocketServer"/> class with the specified
/// with the specified WebSocket URL. /// WebSocket URL.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// <para> /// <para>
/// An instance initialized by this constructor listens for the incoming /// An instance initialized by this constructor listens for the incoming connection requests
/// connection requests on the port (if any) in <paramref name="url"/>. /// on the port (if any) in <paramref name="url"/>.
/// </para> /// </para>
/// <para> /// <para>
/// So if <paramref name="url"/> is without a port, either port 80 or 443 /// So if <paramref name="url"/> is without a port, either port 80 or 443 is used on which to
/// is used on which to listen. It's determined by the scheme (ws or wss) /// listen. It's determined by the scheme (ws or wss) in <paramref name="url"/>. (port 80 if
/// in <paramref name="url"/>. (port 80 if the scheme is ws.) /// the scheme is ws.)
/// </para> /// </para>
/// </remarks> /// </remarks>
/// <param name="url"> /// <param name="url">
@ -150,8 +149,7 @@ namespace WebSocketSharp.Server
_address = host.ToIPAddress (); _address = host.ToIPAddress ();
if (_address == null || !_address.IsLocal ()) if (_address == null || !_address.IsLocal ())
throw new ArgumentException ( throw new ArgumentException (
String.Format ( String.Format ("The host part must be the local host name: {0}", host), "url");
"The host part must be the local host name: {0}", host), "url");
_port = _uri.Port; _port = _uri.Port;
_secure = _uri.Scheme == "wss" ? true : false; _secure = _uri.Scheme == "wss" ? true : false;
@ -160,19 +158,19 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="WebSocketServer"/> class /// Initializes a new instance of the <see cref="WebSocketServer"/> class with the specified
/// with the specified <paramref name="port"/> and <paramref name="secure"/>. /// <paramref name="port"/> and <paramref name="secure"/>.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// An instance initialized by this constructor listens for the incoming /// An instance initialized by this constructor listens for the incoming connection requests on
/// connection requests on <paramref name="port"/>. /// <paramref name="port"/>.
/// </remarks> /// </remarks>
/// <param name="port"> /// <param name="port">
/// An <see cref="int"/> that represents the port number on which to listen. /// An <see cref="int"/> that represents the port number on which to listen.
/// </param> /// </param>
/// <param name="secure"> /// <param name="secure">
/// A <see cref="bool"/> that indicates providing a secure connection or not. /// A <see cref="bool"/> that indicates providing a secure connection or not. (<c>true</c>
/// (<c>true</c> indicates providing a secure connection.) /// indicates providing a secure connection.)
/// </param> /// </param>
/// <exception cref="ArgumentOutOfRangeException"> /// <exception cref="ArgumentOutOfRangeException">
/// <paramref name="port"/> isn't between 1 and 65535. /// <paramref name="port"/> isn't between 1 and 65535.
@ -186,22 +184,20 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="WebSocketServer"/> class /// Initializes a new instance of the <see cref="WebSocketServer"/> class with the specified
/// with the specified <paramref name="address"/> and <paramref name="port"/>. /// <paramref name="address"/> and <paramref name="port"/>.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// <para> /// <para>
/// An instance initialized by this constructor listens for the incoming /// An instance initialized by this constructor listens for the incoming connection requests
/// connection requests on <paramref name="port"/>. /// on <paramref name="port"/>.
/// </para> /// </para>
/// <para> /// <para>
/// And if <paramref name="port"/> is 443, that instance provides a secure /// And if <paramref name="port"/> is 443, that instance provides a secure connection.
/// connection.
/// </para> /// </para>
/// </remarks> /// </remarks>
/// <param name="address"> /// <param name="address">
/// A <see cref="System.Net.IPAddress"/> that represents the local IP address /// A <see cref="System.Net.IPAddress"/> that represents the local IP address of the server.
/// of the server.
/// </param> /// </param>
/// <param name="port"> /// <param name="port">
/// An <see cref="int"/> that represents the port number on which to listen. /// An <see cref="int"/> that represents the port number on which to listen.
@ -221,24 +217,22 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="WebSocketServer"/> class /// Initializes a new instance of the <see cref="WebSocketServer"/> class with the specified
/// with the specified <paramref name="address"/>, <paramref name="port"/>, /// <paramref name="address"/>, <paramref name="port"/>, and <paramref name="secure"/>.
/// and <paramref name="secure"/>.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// An instance initialized by this constructor listens for the incoming /// An instance initialized by this constructor listens for the incoming connection requests on
/// connection requests on <paramref name="port"/>. /// <paramref name="port"/>.
/// </remarks> /// </remarks>
/// <param name="address"> /// <param name="address">
/// A <see cref="System.Net.IPAddress"/> that represents the local IP address /// A <see cref="System.Net.IPAddress"/> that represents the local IP address of the server.
/// of the server.
/// </param> /// </param>
/// <param name="port"> /// <param name="port">
/// An <see cref="int"/> that represents the port number on which to listen. /// An <see cref="int"/> that represents the port number on which to listen.
/// </param> /// </param>
/// <param name="secure"> /// <param name="secure">
/// A <see cref="bool"/> that indicates providing a secure connection or not. /// A <see cref="bool"/> that indicates providing a secure connection or not. (<c>true</c>
/// (<c>true</c> indicates providing a secure connection.) /// indicates providing a secure connection.)
/// </param> /// </param>
/// <exception cref="ArgumentNullException"> /// <exception cref="ArgumentNullException">
/// <paramref name="address"/> is <see langword="null"/>. /// <paramref name="address"/> is <see langword="null"/>.
@ -254,25 +248,21 @@ namespace WebSocketSharp.Server
/// -or- /// -or-
/// </para> /// </para>
/// <para> /// <para>
/// Pair of <paramref name="port"/> and <paramref name="secure"/> is /// Pair of <paramref name="port"/> and <paramref name="secure"/> is invalid.
/// invalid.
/// </para> /// </para>
/// </exception> /// </exception>
public WebSocketServer (System.Net.IPAddress address, int port, bool secure) public WebSocketServer (System.Net.IPAddress address, int port, bool secure)
{ {
if (!address.IsLocal ()) if (!address.IsLocal ())
throw new ArgumentException ( throw new ArgumentException (
String.Format ( String.Format ("Must be the local IP address: {0}", address), "address");
"Must be the local IP address: {0}", address), "address");
if (!port.IsPortNumber ()) if (!port.IsPortNumber ())
throw new ArgumentOutOfRangeException ( throw new ArgumentOutOfRangeException ("port", "Must be between 1 and 65535: " + port);
"port", "Must be between 1 and 65535: " + port);
if ((port == 80 && secure) || (port == 443 && !secure)) if ((port == 80 && secure) || (port == 443 && !secure))
throw new ArgumentException ( throw new ArgumentException (
String.Format ( String.Format ("Invalid pair of 'port' and 'secure': {0}, {1}", port, secure));
"Invalid pair of 'port' and 'secure': {0}, {1}", port, secure));
_address = address; _address = address;
_port = port; _port = port;
@ -290,8 +280,7 @@ namespace WebSocketSharp.Server
/// Gets the local IP address of the server. /// Gets the local IP address of the server.
/// </summary> /// </summary>
/// <value> /// <value>
/// A <see cref="System.Net.IPAddress"/> that represents the local IP /// A <see cref="System.Net.IPAddress"/> that represents the local IP address of the server.
/// address of the server.
/// </value> /// </value>
public System.Net.IPAddress Address { public System.Net.IPAddress Address {
get { get {
@ -303,9 +292,9 @@ namespace WebSocketSharp.Server
/// Gets or sets the scheme used to authenticate the clients. /// Gets or sets the scheme used to authenticate the clients.
/// </summary> /// </summary>
/// <value> /// <value>
/// One of the <see cref="WebSocketSharp.Net.AuthenticationSchemes"/> enum /// One of the <see cref="WebSocketSharp.Net.AuthenticationSchemes"/> enum values, indicates
/// values, indicates the scheme used to authenticate the clients. The default /// the scheme used to authenticate the clients.
/// value is <see cref="WebSocketSharp.Net.AuthenticationSchemes.Anonymous"/>. /// The default value is <see cref="WebSocketSharp.Net.AuthenticationSchemes.Anonymous"/>.
/// </value> /// </value>
public AuthenticationSchemes AuthenticationSchemes { public AuthenticationSchemes AuthenticationSchemes {
get { get {
@ -321,8 +310,7 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Gets or sets the certificate used to authenticate the server on the /// Gets or sets the certificate used to authenticate the server on the secure connection.
/// secure connection.
/// </summary> /// </summary>
/// <value> /// <value>
/// A <see cref="X509Certificate2"/> used to authenticate the server. /// A <see cref="X509Certificate2"/> used to authenticate the server.
@ -366,12 +354,12 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Gets or sets a value indicating whether the server cleans up the inactive /// Gets or sets a value indicating whether the server cleans up the inactive sessions
/// sessions periodically. /// periodically.
/// </summary> /// </summary>
/// <value> /// <value>
/// <c>true</c> if the server cleans up the inactive sessions every 60 /// <c>true</c> if the server cleans up the inactive sessions every 60 seconds; otherwise,
/// seconds; otherwise, <c>false</c>. The default value is <c>true</c>. /// <c>false</c>. The default value is <c>true</c>.
/// </value> /// </value>
public bool KeepClean { public bool KeepClean {
get { get {
@ -387,9 +375,9 @@ namespace WebSocketSharp.Server
/// Gets the logging functions. /// Gets the logging functions.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// The default logging level is <see cref="LogLevel.ERROR"/>. If you would /// The default logging level is <see cref="LogLevel.ERROR"/>. If you would like to change it,
/// like to change it, you should set the <c>Log.Level</c> property to any of /// you should set the <c>Log.Level</c> property to any of the <see cref="LogLevel"/> enum
/// the <see cref="LogLevel"/> enum values. /// values.
/// </remarks> /// </remarks>
/// <value> /// <value>
/// A <see cref="Logger"/> that provides the logging functions. /// A <see cref="Logger"/> that provides the logging functions.
@ -413,12 +401,11 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Gets or sets the name of the realm associated with the /// Gets or sets the name of the realm associated with the server.
/// <see cref="WebSocketServer"/>.
/// </summary> /// </summary>
/// <value> /// <value>
/// A <see cref="string"/> that represents the name of the realm. /// A <see cref="string"/> that represents the name of the realm. The default value is
/// The default value is <c>SECRET AREA</c>. /// <c>SECRET AREA</c>.
/// </value> /// </value>
public string Realm { public string Realm {
get { get {
@ -434,13 +421,13 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Gets or sets the delegate called to find the credentials for an identity /// Gets or sets the delegate called to find the credentials for an identity used to
/// used to authenticate a client. /// authenticate a client.
/// </summary> /// </summary>
/// <value> /// <value>
/// A Func&lt;<see cref="IIdentity"/>, <see cref="NetworkCredential"/>&gt; /// A Func&lt;<see cref="IIdentity"/>, <see cref="NetworkCredential"/>&gt; delegate that
/// delegate that references the method(s) used to find the credentials. /// references the method(s) used to find the credentials. The default value is a function
/// The default value is a function that only returns <see langword="null"/>. /// that only returns <see langword="null"/>.
/// </value> /// </value>
public Func<IIdentity, NetworkCredential> UserCredentialsFinder { public Func<IIdentity, NetworkCredential> UserCredentialsFinder {
get { get {
@ -456,7 +443,7 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Gets the access to the WebSocket services provided by the <see cref="WebSocketServer"/>. /// Gets the access to the WebSocket services provided by the server.
/// </summary> /// </summary>
/// <value> /// <value>
/// A <see cref="WebSocketServiceManager"/> that manages the WebSocket services. /// A <see cref="WebSocketServiceManager"/> that manages the WebSocket services.
@ -512,8 +499,7 @@ namespace WebSocketSharp.Server
var path = context.Path; var path = context.Path;
WebSocketServiceHost host; WebSocketServiceHost host;
if (path == null || if (path == null || !_services.TryGetServiceHostInternally (path, out host)) {
!_services.TryGetServiceHostInternally (path, out host)) {
context.Close (HttpStatusCode.NotImplemented); context.Close (HttpStatusCode.NotImplemented);
return; return;
} }
@ -551,8 +537,7 @@ namespace WebSocketSharp.Server
} }
var header = context.Headers ["Authorization"]; var header = context.Headers ["Authorization"];
if (header == null || if (header == null || !header.StartsWith (expected, StringComparison.OrdinalIgnoreCase)) {
!header.StartsWith (expected, StringComparison.OrdinalIgnoreCase)) {
context.SendAuthChallenge (challenge); context.SendAuthChallenge (challenge);
return auth (); return auth ();
} }
@ -573,7 +558,7 @@ namespace WebSocketSharp.Server
if (_state == ServerState.START || _state == ServerState.SHUTDOWN) { if (_state == ServerState.START || _state == ServerState.SHUTDOWN) {
_logger.Error ( _logger.Error (
String.Format ( String.Format (
"The '{0}' property cannot set a value because the server has already been started.", "Set operation of {0} isn't available because the server has already started.",
property)); property));
return false; return false;
@ -606,9 +591,7 @@ namespace WebSocketSharp.Server
acceptRequestAsync (_listener.AcceptTcpClient ()); acceptRequestAsync (_listener.AcceptTcpClient ());
} }
catch (SocketException ex) { catch (SocketException ex) {
_logger.Warn ( _logger.Warn (String.Format ("Receiving has been stopped.\nreason: {0}.", ex.Message));
String.Format (
"Receiving has been stopped.\nreason: {0}.", ex.Message));
break; break;
} }
@ -655,74 +638,65 @@ namespace WebSocketSharp.Server
#region Public Methods #region Public Methods
/// <summary> /// <summary>
/// Adds the specified typed WebSocket service with the specified /// Adds the specified typed WebSocket service with the specified <paramref name="path"/>.
/// <paramref name="servicePath"/>.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// This method converts <paramref name="servicePath"/> to URL-decoded string /// This method converts <paramref name="path"/> to URL-decoded string and removes <c>'/'</c>
/// and removes <c>'/'</c> from tail end of <paramref name="servicePath"/>. /// from tail end of <paramref name="path"/>.
/// </remarks> /// </remarks>
/// <param name="servicePath"> /// <param name="path">
/// A <see cref="string"/> that represents the absolute path to the WebSocket /// A <see cref="string"/> that represents the absolute path to the WebSocket service to add.
/// service.
/// </param> /// </param>
/// <typeparam name="TWithNew"> /// <typeparam name="TWithNew">
/// The type of the WebSocket service. The TWithNew must inherit the /// The type of the WebSocket service.
/// <see cref="WebSocketService"/> class and must have a public parameterless /// The TWithNew must inherit the <see cref="WebSocketService"/> class and must have a public
/// constructor. /// parameterless constructor.
/// </typeparam> /// </typeparam>
public void AddWebSocketService<TWithNew> (string servicePath) public void AddWebSocketService<TWithNew> (string path)
where TWithNew : WebSocketService, new () where TWithNew : WebSocketService, new ()
{ {
AddWebSocketService<TWithNew> (servicePath, () => new TWithNew ()); AddWebSocketService<TWithNew> (path, () => new TWithNew ());
} }
/// <summary> /// <summary>
/// Adds the specified typed WebSocket service with the specified /// Adds the specified typed WebSocket service with the specified <paramref name="path"/>
/// <paramref name="servicePath"/> and <paramref name="serviceConstructor"/>. /// and <paramref name="constructor"/>.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// <para> /// <para>
/// This method converts <paramref name="servicePath"/> to URL-decoded /// This method converts <paramref name="path"/> to URL-decoded string and removes <c>'/'</c>
/// string and removes <c>'/'</c> from tail end of /// from tail end of <paramref name="path"/>.
/// <paramref name="servicePath"/>.
/// </para> /// </para>
/// <para> /// <para>
/// <paramref name="serviceConstructor"/> returns a initialized specified /// <paramref name="constructor"/> returns a initialized specified typed
/// typed WebSocket service instance. /// <see cref="WebSocketService"/> instance.
/// </para> /// </para>
/// </remarks> /// </remarks>
/// <param name="servicePath"> /// <param name="path">
/// A <see cref="string"/> that represents the absolute path to the WebSocket /// A <see cref="string"/> that represents the absolute path to the WebSocket service to add.
/// service.
/// </param> /// </param>
/// <param name="serviceConstructor"> /// <param name="constructor">
/// A Func&lt;T&gt; delegate that references the method used to initialize /// A Func&lt;T&gt; delegate that references the method used to initialize a new specified
/// a new WebSocket service instance (a new WebSocket session). /// typed <see cref="WebSocketService"/> instance (a new <see cref="IWebSocketSession"/>
/// instance).
/// </param> /// </param>
/// <typeparam name="T"> /// <typeparam name="T">
/// The type of the WebSocket service. The T must inherit the /// The type of the WebSocket service. The T must inherit the <see cref="WebSocketService"/>
/// <see cref="WebSocketService"/> class. /// class.
/// </typeparam> /// </typeparam>
public void AddWebSocketService<T> ( public void AddWebSocketService<T> (string path, Func<T> constructor)
string servicePath, Func<T> serviceConstructor)
where T : WebSocketService where T : WebSocketService
{ {
var msg = servicePath.CheckIfValidServicePath () ?? var msg = path.CheckIfValidServicePath () ??
(serviceConstructor == null (constructor == null ? "'constructor' must not be null." : null);
? "'serviceConstructor' must not be null."
: null);
if (msg != null) { if (msg != null) {
_logger.Error ( _logger.Error (String.Format ("{0}\nservice path: {1}", msg, path));
String.Format ("{0}\nservice path: {1}", msg, servicePath ?? ""));
return; return;
} }
var host = new WebSocketServiceHost<T> ( var host = new WebSocketServiceHost<T> (path, constructor, _logger);
servicePath, serviceConstructor, _logger);
if (!KeepClean) if (!KeepClean)
host.KeepClean = false; host.KeepClean = false;
@ -730,32 +704,29 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Removes the WebSocket service with the specified /// Removes the WebSocket service with the specified <paramref name="path"/>.
/// <paramref name="servicePath"/>.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// This method converts <paramref name="servicePath"/> to URL-decoded string /// This method converts <paramref name="path"/> to URL-decoded string and removes <c>'/'</c>
/// and removes <c>'/'</c> from tail end of <paramref name="servicePath"/>. /// from tail end of <paramref name="path"/>.
/// </remarks> /// </remarks>
/// <returns> /// <returns>
/// <c>true</c> if the WebSocket service is successfully found and removed; /// <c>true</c> if the WebSocket service is successfully found and removed; otherwise,
/// otherwise, <c>false</c>. /// <c>false</c>.
/// </returns> /// </returns>
/// <param name="servicePath"> /// <param name="path">
/// A <see cref="string"/> that represents the absolute path to the WebSocket /// A <see cref="string"/> that represents the absolute path to the WebSocket service to find.
/// service to find.
/// </param> /// </param>
public bool RemoveWebSocketService (string servicePath) public bool RemoveWebSocketService (string path)
{ {
var msg = servicePath.CheckIfValidServicePath (); var msg = path.CheckIfValidServicePath ();
if (msg != null) { if (msg != null) {
_logger.Error ( _logger.Error (String.Format ("{0}\nservice path: {1}", msg, path));
String.Format ("{0}\nservice path: {1}", msg, servicePath));
return false; return false;
} }
return _services.Remove (servicePath); return _services.Remove (path);
} }
/// <summary> /// <summary>
@ -766,9 +737,7 @@ namespace WebSocketSharp.Server
lock (_sync) { lock (_sync) {
var msg = _state.CheckIfStartable () ?? checkIfCertExists (); var msg = _state.CheckIfStartable () ?? checkIfCertExists ();
if (msg != null) { if (msg != null) {
_logger.Error ( _logger.Error (String.Format ("{0}\nstate: {1}\nsecure: {2}", msg, _state, _secure));
String.Format (
"{0}\nstate: {1}\nsecure: {2}", msg, _state, _secure));
return; return;
} }
@ -803,12 +772,11 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Stops receiving the WebSocket connection requests with the specified /// Stops receiving the WebSocket connection requests with the specified <see cref="ushort"/>
/// <see cref="ushort"/> and <see cref="string"/>. /// and <see cref="string"/>.
/// </summary> /// </summary>
/// <param name="code"> /// <param name="code">
/// A <see cref="ushort"/> that represents the status code indicating the /// A <see cref="ushort"/> that represents the status code indicating the reason for stop.
/// reason for stop.
/// </param> /// </param>
/// <param name="reason"> /// <param name="reason">
/// A <see cref="string"/> that represents the reason for stop. /// A <see cref="string"/> that represents the reason for stop.
@ -823,8 +791,7 @@ namespace WebSocketSharp.Server
if (msg != null) { if (msg != null) {
_logger.Error ( _logger.Error (
String.Format ( String.Format ("{0}\nstate: {1}\ncode: {2}\nreason: {3}", msg, _state, code, reason));
"{0}\nstate: {1}\ncode: {2}\nreason: {3}", msg, _state, code, reason));
return; return;
} }
@ -843,8 +810,8 @@ namespace WebSocketSharp.Server
/// <see cref="CloseStatusCode"/> and <see cref="string"/>. /// <see cref="CloseStatusCode"/> and <see cref="string"/>.
/// </summary> /// </summary>
/// <param name="code"> /// <param name="code">
/// One of the <see cref="CloseStatusCode"/> enum values, represents the /// One of the <see cref="CloseStatusCode"/> enum values, represents the status code indicating
/// status code indicating the reason for stop. /// the reason for stop.
/// </param> /// </param>
/// <param name="reason"> /// <param name="reason">
/// A <see cref="string"/> that represents the reason for stop. /// A <see cref="string"/> that represents the reason for stop.
@ -857,8 +824,7 @@ namespace WebSocketSharp.Server
(data = ((ushort) code).Append (reason)).CheckIfValidControlData ("reason"); (data = ((ushort) code).Append (reason)).CheckIfValidControlData ("reason");
if (msg != null) { if (msg != null) {
_logger.Error ( _logger.Error (String.Format ("{0}\nstate: {1}\nreason: {2}", msg, _state, reason));
String.Format ("{0}\nstate: {1}\nreason: {2}", msg, _state, reason));
return; return;
} }