From bf53fa97d7b32173d68de6e40deca7496f3b24fc Mon Sep 17 00:00:00 2001 From: sta Date: Thu, 16 Nov 2017 15:28:25 +0900 Subject: [PATCH] [Modify] Polish it --- websocket-sharp/WebSocket.cs | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index a36f0b3b..8791fe9c 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -1220,17 +1220,25 @@ namespace WebSocketSharp private bool connect () { lock (_forState) { - string msg; - if (!checkIfAvailable (true, false, false, true, out msg)) { - _logger.Error (msg); - error ("An error has occurred in connecting.", null); + if (_readyState == WebSocketState.Open) { + var msg = "The connection has already been established."; + _logger.Warn (msg); + + return false; + } + + if (_readyState == WebSocketState.Closing) { + var msg = "The close process is in progress."; + _logger.Warn (msg); return false; } if (_retryCountForConnect > _maxRetryCountForConnect) { _retryCountForConnect = 0; - _logger.Fatal ("A series of reconnecting has failed."); + + var msg = "A series of reconnecting has failed."; + _logger.Fatal (msg); return false; } @@ -1242,8 +1250,12 @@ namespace WebSocketSharp } catch (Exception ex) { _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; }