flywithu/CryptoExchange.Net
1
0
Fork 0
mirror of https://github.com/JKorf/CryptoExchange.Net.git synced 2026-08-11 16:32:57 +00:00
Code Issues Releases Wiki Activity

Revert "added locks to socket"

Browse Source 
This reverts commit 4b382ed480.
This commit is contained in:
JKorf
2019-01-03 08:52:44 +01:00
parent 4b382ed480
commit fbbcb319ab
1 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CryptoExchange.Net/Sockets/BaseSocket.cs
+15 -22
View File
@@ -115,7 +115,7 @@ namespace CryptoExchange.Net.Sockets
{
while (true)
{
if (socket?.State != WebSocketState.Open)
if (socket == null || socket.State != WebSocketState.Open)
return;
if (DateTime.UtcNow - LastActionTime > Timeout)
@@ -165,37 +165,30 @@ namespace CryptoExchange.Net.Sockets
public virtual void Reset()
{
lock (socketLock)
{
socket.Dispose();
socket = null;
}
socket.Dispose();
socket = null;
}
public virtual void Send(string data)
{
lock (socketLock)
socket?.Send(data);
socket.Send(data);
}
public virtual async Task<bool> Connect()
{
lock (socketLock)
if (socket == null)
{
if (socket == null)
socket = new WebSocket(Url, cookies: cookies.ToList(), customHeaderItems: headers.ToList())
{
socket = new WebSocket(Url, cookies: cookies.ToList(), customHeaderItems: headers.ToList())
{
EnableAutoSendPing = true,
AutoSendPingInterval = 10
};
socket.Security.EnabledSslProtocols = SSLProtocols;
socket.Opened += (o, s) => Handle(openHandlers);
socket.Closed += (o, s) => Handle(closeHandlers);
socket.Error += (o, s) => Handle(errorHandlers, s.Exception);
socket.MessageReceived += (o, s) => Handle(messageHandlers, s.Message);
socket.DataReceived += (o, s) => HandleByteData(s.Data);
}
EnableAutoSendPing = true,
AutoSendPingInterval = 10
};
socket.Security.EnabledSslProtocols = SSLProtocols;
socket.Opened += (o, s) => Handle(openHandlers);
socket.Closed += (o, s) => Handle(closeHandlers);
socket.Error += (o, s) => Handle(errorHandlers, s.Exception);
socket.MessageReceived += (o, s) => Handle(messageHandlers, s.Message);
socket.DataReceived += (o, s) => HandleByteData(s.Data);
}
return await Task.Run(() =>