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

Cleaned up Disconnect function locking

Browse Source
This commit is contained in:
RogueException
2016-08-01 22:50:57 -03:00
parent 9fc92d016d
commit dcd13e98e9
2 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Discord.Net/Rpc/DiscordRpcClient.cs
View File

@@ -113,23 +113,13 @@ namespace Discord.Rpc
} }
} }
/// <inheritdoc /> /// <inheritdoc />
/// <inheritdoc /> public async Task DisconnectAsync()
public Task DisconnectAsync() => DisconnectAsync(null, false);
private async Task DisconnectAsync(Exception ex = null, bool isReconnecting = false)
{ {
if (ex == null) if (_connectTask?.TrySetCanceled() ?? false) return;
{
if (_connectTask?.TrySetCanceled() ?? false) return;
}
else
{
if (_connectTask?.TrySetException(ex) ?? false) return;
}
await _connectionLock.WaitAsync().ConfigureAwait(false); await _connectionLock.WaitAsync().ConfigureAwait(false);
try try
{ {
await DisconnectInternalAsync(ex, isReconnecting).ConfigureAwait(false); await DisconnectInternalAsync(null, false).ConfigureAwait(false);
} }
finally { _connectionLock.Release(); } finally { _connectionLock.Release(); }
} }
@@ -174,7 +164,14 @@ namespace Discord.Rpc
} }
private async Task ReconnectInternalAsync(Exception ex, CancellationToken cancelToken) private async Task ReconnectInternalAsync(Exception ex, CancellationToken cancelToken)
{ {
await DisconnectAsync(null, true).ConfigureAwait(false); if (ex == null)
{
if (_connectTask?.TrySetCanceled() ?? false) return;
}
else
{
if (_connectTask?.TrySetException(ex) ?? false) return;
}
try try
{ {

26
src/Discord.Net/WebSocket/DiscordSocketClient.cs
View File

@@ -181,22 +181,13 @@ namespace Discord.WebSocket
} }
} }
/// <inheritdoc /> /// <inheritdoc />
public Task DisconnectAsync() => DisconnectAsync(null, false); public async Task DisconnectAsync()
private async Task DisconnectAsync(Exception ex = null, bool isReconnecting = false)
{ {
if (ex == null) if (_connectTask?.TrySetCanceled() ?? false) return;
{
if (_connectTask?.TrySetCanceled() ?? false) return;
}
else
{
if (_connectTask?.TrySetException(ex) ?? false) return;
}
await _connectionLock.WaitAsync().ConfigureAwait(false); await _connectionLock.WaitAsync().ConfigureAwait(false);
try try
{ {
await DisconnectInternalAsync(ex, isReconnecting).ConfigureAwait(false); await DisconnectInternalAsync(null, false).ConfigureAwait(false);
} }
finally { _connectionLock.Release(); } finally { _connectionLock.Release(); }
} }
@@ -269,7 +260,14 @@ namespace Discord.WebSocket
} }
private async Task ReconnectInternalAsync(Exception ex, CancellationToken cancelToken) private async Task ReconnectInternalAsync(Exception ex, CancellationToken cancelToken)
{ {
await DisconnectAsync(null, true).ConfigureAwait(false); if (ex == null)
{
if (_connectTask?.TrySetCanceled() ?? false) return;
}
else
{
if (_connectTask?.TrySetException(ex) ?? false) return;
}
try try
{ {
@@ -579,7 +577,7 @@ namespace Discord.WebSocket
} }
catch (Exception ex) catch (Exception ex)
{ {
await DisconnectAsync(new Exception("Processing READY failed", ex), false); _connectTask.TrySetException(new Exception("Processing READY failed", ex));
return; return;
} }