Browse Source

Push an error to the log if an event was failed to be processed

tags/docs-0.9
RogueException 9 years ago
parent
commit
45e41af294
2 changed files with 28 additions and 14 deletions
  1. +7
    -0
      src/Discord.Net/DiscordClient.cs
  2. +21
    -14
      src/Discord.Net/DiscordSimpleClient.cs

+ 7
- 0
src/Discord.Net/DiscordClient.cs View File

@@ -337,6 +337,8 @@ namespace Discord

internal override async Task OnReceivedEvent(WebSocketEventEventArgs e)
{
try
{
await base.OnReceivedEvent(e);

switch (e.Type)
@@ -682,6 +684,11 @@ namespace Discord
default:
RaiseOnLog(LogMessageSeverity.Warning, LogMessageSource.DataWebSocket, $"Unknown message type: {e.Type}");
break;
}
}
catch (Exception ex)
{
RaiseOnLog(LogMessageSeverity.Error, LogMessageSource.Client, $"Error handling {e.Type} event: {ex.GetBaseException().Message}");
}
}



+ 21
- 14
src/Discord.Net/DiscordSimpleClient.cs View File

@@ -289,23 +289,30 @@ namespace Discord

internal virtual Task OnReceivedEvent(WebSocketEventEventArgs e)
{
switch (e.Type)
try
{
case "READY":
_currentUserId = e.Payload["user"].Value<string>("id");
break;
case "VOICE_SERVER_UPDATE":
{
string guildId = e.Payload.Value<string>("guild_id");
if (_enableVoice && guildId == _voiceSocket.CurrentServerId)
switch (e.Type)
{
case "READY":
_currentUserId = e.Payload["user"].Value<string>("id");
break;
case "VOICE_SERVER_UPDATE":
{
string token = e.Payload.Value<string>("token");
_voiceSocket.Host = "wss://" + e.Payload.Value<string>("endpoint").Split(':')[0];
return _voiceSocket.Login(_currentUserId, _dataSocket.SessionId, token, CancelToken);
string guildId = e.Payload.Value<string>("guild_id");

if (_enableVoice && guildId == _voiceSocket.CurrentServerId)
{
string token = e.Payload.Value<string>("token");
_voiceSocket.Host = "wss://" + e.Payload.Value<string>("endpoint").Split(':')[0];
return _voiceSocket.Login(_currentUserId, _dataSocket.SessionId, token, CancelToken);
}
}
}
break;
break;
}
}
catch (Exception ex)
{
RaiseOnLog(LogMessageSeverity.Error, LogMessageSource.Client, $"Error handling {e.Type} event: {ex.GetBaseException().Message}");
}
return TaskHelper.CompletedTask;
}


Loading…
Cancel
Save