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

[Modify] Polish it

Browse Source
This commit is contained in:
sta 2017-11-16 15:28:25 +09:00
parent 04b29bce21
commit bf53fa97d7
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
websocket-sharp/WebSocket.cs
View File

@ -1220,17 +1220,25 @@ namespace WebSocketSharp
private bool connect () private bool connect ()
{ {
lock (_forState) { lock (_forState) {
string msg; if (_readyState == WebSocketState.Open) {
if (!checkIfAvailable (true, false, false, true, out msg)) { var msg = "The connection has already been established.";
_logger.Error (msg); _logger.Warn (msg);
error ("An error has occurred in connecting.", null);
return false;
}
if (_readyState == WebSocketState.Closing) {
var msg = "The close process is in progress.";
_logger.Warn (msg);
return false; return false;
} }
if (_retryCountForConnect > _maxRetryCountForConnect) { if (_retryCountForConnect > _maxRetryCountForConnect) {
_retryCountForConnect = 0; _retryCountForConnect = 0;
_logger.Fatal ("A series of reconnecting has failed.");
var msg = "A series of reconnecting has failed.";
_logger.Fatal (msg);
return false; return false;
} }
@ -1242,8 +1250,12 @@ namespace WebSocketSharp
} }
catch (Exception ex) { catch (Exception ex) {
_retryCountForConnect++; _retryCountForConnect++;
_logger.Fatal (ex.ToString ());
fatal ("An exception has occurred while connecting.", ex); _logger.Fatal (ex.Message);
_logger.Debug (ex.ToString ());
var msg = "An exception has occurred while connecting.";
fatal (msg, ex);
return false; return false;
} }