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

Renamed processException method to acceptException method

Browse Source
This commit is contained in:
sta 2014-01-24 21:03:11 +09:00
parent a209158233
commit 11c02a89a0
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
websocket-sharp/WebSocket.cs
View File

@ -504,6 +504,33 @@ namespace WebSocketSharp
return true;
}
private void acceptException (Exception exception, string reason)
{
var code = CloseStatusCode.ABNORMAL;
var msg = reason;
if (exception is WebSocketException) {
var wsex = (WebSocketException) exception;
code = wsex.Code;
reason = wsex.Message;
}
if (code == CloseStatusCode.ABNORMAL ||
code == CloseStatusCode.TLS_HANDSHAKE_FAILURE) {
_logger.Fatal (exception.ToString ());
reason = msg;
}
else {
_logger.Error (reason);
msg = null;
}
error (msg ?? code.GetMessage ());
if (_readyState == WebSocketState.CONNECTING && !_client)
Close (HttpStatusCode.BadRequest);
else
close (code, reason ?? code.GetMessage (), false);
}
private bool acceptFragmentedFrame (WsFrame frame)
{
return frame.IsContinuation // Not first fragment
@ -605,7 +632,7 @@ namespace WebSocketSharp
WsFrame frame, CloseStatusCode code, string reason)
{
_logger.Debug ("Unsupported frame:\n" + frame.PrintToString (false));
processException (new WebSocketException (code, reason), null);
acceptException (new WebSocketException (code, reason), null);
return false;
}
@ -812,7 +839,7 @@ namespace WebSocketSharp
}
}
catch (Exception ex) {
processException (
acceptException (
ex, "An exception has occurred while connecting.");
}
@ -959,38 +986,11 @@ namespace WebSocketSharp
startReceiving ();
}
catch (Exception ex) {
processException (
acceptException (
ex, "An exception has occurred while opening.");
}
}
private void processException (Exception exception, string reason)
{
var code = CloseStatusCode.ABNORMAL;
var msg = reason;
if (exception is WebSocketException) {
var wsex = (WebSocketException) exception;
code = wsex.Code;
reason = wsex.Message;
}
if (code == CloseStatusCode.ABNORMAL ||
code == CloseStatusCode.TLS_HANDSHAKE_FAILURE) {
_logger.Fatal (exception.ToString ());
reason = msg;
}
else {
_logger.Error (reason);
msg = null;
}
error (msg ?? code.GetMessage ());
if (_readyState == WebSocketState.CONNECTING && !_client)
Close (HttpStatusCode.BadRequest);
else
close (code, reason ?? code.GetMessage (), false);
}
// As server
private void processRequestedExtensions (string extensions)
{
@ -1314,7 +1314,7 @@ namespace WebSocketSharp
else if (_exitReceiving != null)
_exitReceiving.Set ();
},
ex => processException (
ex => acceptException (
ex, "An exception has occurred while receiving a message."));
receive ();
@ -1405,7 +1405,7 @@ namespace WebSocketSharp
}
}
catch (Exception ex) {
processException (
acceptException (
ex, "An exception has occurred while connecting.");
}
}