Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed a deadlock in DiscordShardedClient during a failed Identify #1761

Merged
merged 3 commits into from
Jan 31, 2021
Merged

Fixed a deadlock in DiscordShardedClient during a failed Identify #1761

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41fa91f
fixed a deadlock in DiscordShardedClient during a failed Identify due…
asmejkal Jan 31, 2021
e3af695
fixed log
asmejkal Jan 31, 2021
dba29e9
Don't wait ready before releasing semaphore
SubZero0 Jan 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Discord.Net.WebSocket/DiscordSocketClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,15 +245,15 @@ private async Task OnConnectingAsync()
await _gatewayLogger.DebugAsync("Identifying").ConfigureAwait(false);
await ApiClient.SendIdentifyAsync(shardID: ShardId, totalShards: TotalShards, guildSubscriptions: _guildSubscriptions, gatewayIntents: _gatewayIntents, presence: BuildCurrentStatus()).ConfigureAwait(false);
}

//Wait for READY
await _connection.WaitAsync().ConfigureAwait(false);
}
finally
{
if (locked)
_shardedClient.ReleaseIdentifyLock();
}

//Wait for READY
await _connection.WaitAsync().ConfigureAwait(false);
}
private async Task OnDisconnectingAsync(Exception ex)
{
Expand Down Expand Up @@ -632,7 +632,7 @@ private async Task ProcessMessageAsync(GatewayOpCode opCode, int? seq, string ty
}
else if (_connection.CancelToken.IsCancellationRequested)
return;

if (BaseConfig.AlwaysDownloadUsers)
_ = DownloadUsersAsync(Guilds.Where(x => x.IsAvailable && !x.HasAllMembers));

Expand Down