mirror of
https://github.com/JKorf/CryptoExchange.Net
synced 2025-06-09 08:56:13 +00:00
Socket reconnecting fix
This commit is contained in:
parent
90dac4a0d6
commit
acb8f6af59
@ -7,7 +7,7 @@
|
|||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PackageId>CryptoExchange.Net</PackageId>
|
<PackageId>CryptoExchange.Net</PackageId>
|
||||||
<Authors>JKorf</Authors>
|
<Authors>JKorf</Authors>
|
||||||
<PackageVersion>2.0.3</PackageVersion>
|
<PackageVersion>2.0.5</PackageVersion>
|
||||||
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
|
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
|
||||||
<PackageProjectUrl>https://github.com/JKorf/CryptoExchange.Net</PackageProjectUrl>
|
<PackageProjectUrl>https://github.com/JKorf/CryptoExchange.Net</PackageProjectUrl>
|
||||||
<PackageLicenseUrl>https://github.com/JKorf/CryptoExchange.Net/blob/master/LICENSE</PackageLicenseUrl>
|
<PackageLicenseUrl>https://github.com/JKorf/CryptoExchange.Net/blob/master/LICENSE</PackageLicenseUrl>
|
||||||
|
@ -14,6 +14,7 @@ namespace CryptoExchange.Net.Interfaces
|
|||||||
|
|
||||||
int Id { get; }
|
int Id { get; }
|
||||||
bool ShouldReconnect { get; set; }
|
bool ShouldReconnect { get; set; }
|
||||||
|
bool Reconnecting { get; set; }
|
||||||
Func<byte[], string> DataInterpreter { get; set; }
|
Func<byte[], string> DataInterpreter { get; set; }
|
||||||
DateTime? DisconnectTime { get; set; }
|
DateTime? DisconnectTime { get; set; }
|
||||||
string Url { get; }
|
string Url { get; }
|
||||||
|
@ -169,6 +169,11 @@ namespace CryptoExchange.Net
|
|||||||
{
|
{
|
||||||
if (socket.ShouldReconnect)
|
if (socket.ShouldReconnect)
|
||||||
{
|
{
|
||||||
|
if (socket.Reconnecting)
|
||||||
|
return; // Already reconnecting
|
||||||
|
|
||||||
|
socket.Reconnecting = true;
|
||||||
|
|
||||||
log.Write(LogVerbosity.Info, $"Socket {socket.Id} Connection lost, will try to reconnect");
|
log.Write(LogVerbosity.Info, $"Socket {socket.Id} Connection lost, will try to reconnect");
|
||||||
Task.Run(() =>
|
Task.Run(() =>
|
||||||
{
|
{
|
||||||
@ -191,6 +196,7 @@ namespace CryptoExchange.Net
|
|||||||
lock (sockets)
|
lock (sockets)
|
||||||
subscription = sockets.Single(s => s.Socket == socket);
|
subscription = sockets.Single(s => s.Socket == socket);
|
||||||
|
|
||||||
|
socket.Reconnecting = false;
|
||||||
if (!SocketReconnect(subscription, DateTime.UtcNow - time.Value))
|
if (!SocketReconnect(subscription, DateTime.UtcNow - time.Value))
|
||||||
socket.Close().Wait(); // Close so we end up reconnecting again
|
socket.Close().Wait(); // Close so we end up reconnecting again
|
||||||
else
|
else
|
||||||
|
@ -32,7 +32,10 @@ namespace CryptoExchange.Net.Sockets
|
|||||||
|
|
||||||
public int Id { get; }
|
public int Id { get; }
|
||||||
public DateTime? DisconnectTime { get; set; }
|
public DateTime? DisconnectTime { get; set; }
|
||||||
|
|
||||||
public bool ShouldReconnect { get; set; }
|
public bool ShouldReconnect { get; set; }
|
||||||
|
public bool Reconnecting { get; set; }
|
||||||
|
|
||||||
public string Url { get; }
|
public string Url { get; }
|
||||||
public bool IsClosed => socket.State == WebSocketState.Closed;
|
public bool IsClosed => socket.State == WebSocketState.Closed;
|
||||||
public bool IsOpen => socket.State == WebSocketState.Open;
|
public bool IsOpen => socket.State == WebSocketState.Open;
|
||||||
@ -114,6 +117,8 @@ namespace CryptoExchange.Net.Sockets
|
|||||||
protected void CheckTimeout()
|
protected void CheckTimeout()
|
||||||
{
|
{
|
||||||
while (true)
|
while (true)
|
||||||
|
{
|
||||||
|
lock (socketLock)
|
||||||
{
|
{
|
||||||
if (socket == null || socket.State != WebSocketState.Open)
|
if (socket == null || socket.State != WebSocketState.Open)
|
||||||
return;
|
return;
|
||||||
@ -121,9 +126,10 @@ namespace CryptoExchange.Net.Sockets
|
|||||||
if (DateTime.UtcNow - LastActionTime > Timeout)
|
if (DateTime.UtcNow - LastActionTime > Timeout)
|
||||||
{
|
{
|
||||||
log.Write(LogVerbosity.Warning, $"No data received for {Timeout}, reconnecting socket");
|
log.Write(LogVerbosity.Warning, $"No data received for {Timeout}, reconnecting socket");
|
||||||
Close().Wait();
|
Close().ConfigureAwait(false);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Thread.Sleep(500);
|
Thread.Sleep(500);
|
||||||
}
|
}
|
||||||
@ -165,9 +171,12 @@ namespace CryptoExchange.Net.Sockets
|
|||||||
|
|
||||||
public virtual void Reset()
|
public virtual void Reset()
|
||||||
{
|
{
|
||||||
socket.Dispose();
|
lock (socketLock)
|
||||||
|
{
|
||||||
|
socket?.Dispose();
|
||||||
socket = null;
|
socket = null;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public virtual void Send(string data)
|
public virtual void Send(string data)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user