flywithu/CryptoExchange.Net
1
0
Fork 0
mirror of https://github.com/JKorf/CryptoExchange.Net synced 2025-06-08 16:36:15 +00:00
Code Issues Releases Wiki Activity

Revert "added locks to socket"

Browse Source 
This reverts commit 4b382ed48057cb80c010bd8532f2fc6983e3464f.
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
CryptoExchange.Net/Sockets/BaseSocket.cs
View File

@ -115,7 +115,7 @@ namespace CryptoExchange.Net.Sockets
{ {
while (true) while (true)
{ {
if (socket?.State != WebSocketState.Open) if (socket == null || socket.State != WebSocketState.Open)
return; return;
if (DateTime.UtcNow - LastActionTime > Timeout) if (DateTime.UtcNow - LastActionTime > Timeout)
@ -165,37 +165,30 @@ namespace CryptoExchange.Net.Sockets
public virtual void Reset() public virtual void Reset()
{ {
lock (socketLock) socket.Dispose();
{ socket = null;
socket.Dispose();
socket = null;
}
} }
public virtual void Send(string data) public virtual void Send(string data)
{ {
lock (socketLock) socket.Send(data);
socket?.Send(data);
} }
public virtual async Task<bool> Connect() 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
EnableAutoSendPing = true, };
AutoSendPingInterval = 10 socket.Security.EnabledSslProtocols = SSLProtocols;
}; socket.Opened += (o, s) => Handle(openHandlers);
socket.Security.EnabledSslProtocols = SSLProtocols; socket.Closed += (o, s) => Handle(closeHandlers);
socket.Opened += (o, s) => Handle(openHandlers); socket.Error += (o, s) => Handle(errorHandlers, s.Exception);
socket.Closed += (o, s) => Handle(closeHandlers); socket.MessageReceived += (o, s) => Handle(messageHandlers, s.Message);
socket.Error += (o, s) => Handle(errorHandlers, s.Exception); socket.DataReceived += (o, s) => HandleByteData(s.Data);
socket.MessageReceived += (o, s) => Handle(messageHandlers, s.Message);
socket.DataReceived += (o, s) => HandleByteData(s.Data);
}
} }
return await Task.Run(() => return await Task.Run(() =>