github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed reconnect logic

Browse Source
This commit is contained in:
RogueException
2016-06-13 15:03:45 -03:00
parent 4cc393f963
commit b703fba0b7
1 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/Discord.Net/DiscordSocketClient.cs
View File

@@ -235,30 +235,37 @@ namespace Discord
} }
private async Task ReconnectInternalAsync() private async Task ReconnectInternalAsync()
{ {
int nextReconnectDelay = 1000; try
while (_isReconnecting)
{ {
try int nextReconnectDelay = 1000;
while (_isReconnecting)
{ {
await Task.Delay(nextReconnectDelay).ConfigureAwait(false);
nextReconnectDelay *= 2;
if (nextReconnectDelay > 30000)
nextReconnectDelay = 30000;
await _connectionLock.WaitAsync().ConfigureAwait(false);
try try
{ {
await ConnectInternalAsync().ConfigureAwait(false); await Task.Delay(nextReconnectDelay).ConfigureAwait(false);
nextReconnectDelay *= 2;
if (nextReconnectDelay > 30000)
nextReconnectDelay = 30000;
await _connectionLock.WaitAsync().ConfigureAwait(false);
try
{
await ConnectInternalAsync().ConfigureAwait(false);
}
finally { _connectionLock.Release(); }
return;
} }
finally { _connectionLock.Release(); } catch (Exception ex)
return; {
} await _gatewayLogger.WarningAsync("Reconnect failed", ex).ConfigureAwait(false);
catch (Exception ex) } }
{ }
await _gatewayLogger.WarningAsync("Reconnect failed", ex).ConfigureAwait(false); finally
} {
_isReconnecting = false;
_reconnectTask = null;
} }
_reconnectTask = null;
} }
/// <inheritdoc /> /// <inheritdoc />
@@ -397,6 +404,7 @@ namespace Discord
await ApiClient.SendResumeAsync(_sessionId, _lastSeq).ConfigureAwait(false); await ApiClient.SendResumeAsync(_sessionId, _lastSeq).ConfigureAwait(false);
else else
await ApiClient.SendIdentifyAsync().ConfigureAwait(false); await ApiClient.SendIdentifyAsync().ConfigureAwait(false);
_heartbeatTime = 0;
_heartbeatTask = RunHeartbeatAsync(data.HeartbeatInterval, _heartbeatCancelToken.Token); _heartbeatTask = RunHeartbeatAsync(data.HeartbeatInterval, _heartbeatCancelToken.Token);
} }
break; break;