WaitOne(0) --> WaitOne(50)

Author: mediumTaj

Scripts/Connection/WSConnector.cs

@@ -215,7 +215,7 @@ public static WSConnector CreateConnector(Credentials credentials, string functi
         public void Send(Message msg, bool queue = false)
         {
 #if ENABLE_MESSAGE_DEBUGGING
-            Log.Debug( "WSConnector", "Sending {0} message: {1}",
+            Log.Debug( "WSConnector.Send()", "Sending {0} message: {1}",
                 msg is TextMessage ? "TextMessage" : "BinaryMessage", 
                 msg is TextMessage ? ((TextMessage)msg).Text : ((BinaryMessage)msg).Data.Length.ToString() + " bytes" );
 #endif
@@ -278,7 +278,7 @@ private IEnumerator ProcessReceiveQueue()
                         {
                             Message msg = _receiveQueue.Dequeue();
 #if ENABLE_MESSAGE_DEBUGGING
-                            Log.Debug( "WSConnector", "Received {0} message: {1}",
+                            Log.Debug( "WSConnector.ProcessReceiveQueue()", "Received {0} message: {1}",
                                 msg is TextMessage ? "TextMessage" : "BinaryMessage", 
                                 msg is TextMessage ? ((TextMessage)msg).Text : ((BinaryMessage)msg).Data.Length.ToString() + " bytes" );
 #endif
@@ -315,7 +315,7 @@ private void SendMessages()
 
                 while (_connectionState == ConnectionState.CONNECTED)
                 {
-                    _sendEvent.WaitOne(0);
+                    _sendEvent.WaitOne(50);
 
                     Message msg = null;
                     lock (_sendQueue)
@@ -324,28 +324,21 @@ private void SendMessages()
                             msg = _sendQueue.Dequeue();
                     }
 
-                    while (msg != null)
-                    {
-                        if (msg is TextMessage)
-                            ws.Send(((TextMessage)msg).Text);
-                        else if (msg is BinaryMessage)
-                            ws.Send(((BinaryMessage)msg).Data);
+                    if (msg == null)
+                        continue;
 
-                        msg = null;
-                        lock (_sendQueue)
-                        {
-                            if (_sendQueue.Count > 0)
-                                msg = _sendQueue.Dequeue();
-                        }
-                    }
+                    if (msg is TextMessage)
+                        ws.Send(((TextMessage)msg).Text);
+                    else if (msg is BinaryMessage)
+                        ws.Send(((BinaryMessage)msg).Data);
                 }
 
                 ws.Close();
             }
             catch (System.Exception e)
             {
                 _connectionState = ConnectionState.DISCONNECTED;
-                Log.Error("WSConnector", "Caught WebSocket exception: {0}", e.ToString());
+                Log.Error("WSConnector.SendMessages()", "Caught WebSocket exception: {0}", e.ToString());
             }
         }
 
@@ -400,7 +393,7 @@ private async Task SendMessagesAsync()
 
                 while (_connectionState == ConnectionState.CONNECTED)
                 {
-                    _sendEvent.WaitOne(0);
+                    _sendEvent.WaitOne(50);
 
                     Message msg = null;
                     lock (_sendQueue)
@@ -431,7 +424,7 @@ private async Task SendMessagesAsync()
             catch (System.Exception e)
             {
                 _connectionState = ConnectionState.DISCONNECTED;
-                Log.Error("WSConnector", "Caught WebSocket exception: {0}", e.ToString());
+                Log.Error("WSConnector.SendMessagesAsync()", "Caught WebSocket exception: {0}", e.ToString());
             }
         }
 
@@ -474,7 +467,7 @@ private void WebSocket_MessageReceived(MessageWebSocket sender, MessageWebSocket
             }
             catch (System.Exception e)
             {
-                Log.Error("WSConnector", "Caught WebSocket exception: {0}", e.ToString());
+                Log.Error("WSConnector.SendMessagesAsync()", "Caught WebSocket exception: {0}", e.ToString());
             }
         }
 #endif