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

Socket connection improvements on reconnect

Browse Source
This commit is contained in:
JKorf 2024-03-28 20:35:49 +01:00
parent e62786a70f
commit b90a0a71e9
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CryptoExchange.Net/Sockets/CryptoExchangeWebSocketClient.cs
View File

@ -194,11 +194,16 @@ namespace CryptoExchange.Net.Sockets
try try
{ {
using CancellationTokenSource tcs = new(TimeSpan.FromSeconds(10)); using CancellationTokenSource tcs = new(TimeSpan.FromSeconds(10));
await _socket.ConnectAsync(Uri, tcs.Token).ConfigureAwait(false); using var linked = CancellationTokenSource.CreateLinkedTokenSource(tcs.Token, _ctsSource.Token);
await _socket.ConnectAsync(Uri, linked.Token).ConfigureAwait(false);
} }
catch (Exception e) catch (Exception e)
{ {
_logger.SocketConnectionFailed(Id, e.Message, e); if (!_ctsSource.IsCancellationRequested)
{
// if _ctsSource was canceled this was already logged
_logger.SocketConnectionFailed(Id, e.Message, e);
}
return false; return false;
} }
@ -386,10 +391,13 @@ namespace CryptoExchange.Net.Sockets
if (_disposed) if (_disposed)
return; return;
if (_ctsSource?.IsCancellationRequested == false)
_ctsSource.Cancel();
_logger.SocketDisposing(Id); _logger.SocketDisposing(Id);
_disposed = true; _disposed = true;
_socket.Dispose(); _socket.Dispose();
_ctsSource.Dispose(); _ctsSource?.Dispose();
_logger.SocketDisposed(Id); _logger.SocketDisposed(Id);
} }

6
CryptoExchange.Net/Sockets/SocketConnection.cs
View File

@ -714,6 +714,12 @@ namespace CryptoExchange.Net.Sockets
return new CallResult(new InvalidOperationError(info)); return new CallResult(new InvalidOperationError(info));
} }
if (!_socket.IsOpen)
{
_logger.LogWarning("[Sckt {SocketId}] msg {RequestId} - Failed to send, socket no longer open", SocketId, requestId);
return new CallResult(new WebError("Failed to send message, socket no longer open"));
}
_logger.SendingData(SocketId, requestId, data); _logger.SendingData(SocketId, requestId, data);
try try
{ {