Browse Source

Minor cleanup

tags/docs-0.9
RogueException 9 years ago
parent
commit
3ea49a4596
1 changed files with 3 additions and 5 deletions
  1. +3
    -5
      src/Discord.Net/WebSockets/WebSocket.cs

+ 3
- 5
src/Discord.Net/WebSockets/WebSocket.cs View File

@@ -74,7 +74,7 @@ namespace Discord.WebSockets
_engine.ProcessMessage += async (s, e) => _engine.ProcessMessage += async (s, e) =>
{ {
if (_logLevel >= LogMessageSeverity.Debug) if (_logLevel >= LogMessageSeverity.Debug)
RaiseOnLog(LogMessageSeverity.Debug, $"In: " + e.Message);
RaiseOnLog(LogMessageSeverity.Debug, $"In: {e.Message}");
await ProcessMessage(e.Message); await ProcessMessage(e.Message);
}; };
} }
@@ -86,14 +86,12 @@ namespace Discord.WebSockets


try try
{ {
await Disconnect().ConfigureAwait(false);
await Disconnect().ConfigureAwait(false);


_cancelTokenSource = new CancellationTokenSource();
if (ParentCancelToken == null) if (ParentCancelToken == null)
throw new InvalidOperationException("Parent cancel token was never set."); throw new InvalidOperationException("Parent cancel token was never set.");
_cancelTokenSource = new CancellationTokenSource();
_cancelToken = CancellationTokenSource.CreateLinkedTokenSource(_cancelTokenSource.Token, ParentCancelToken.Value).Token; _cancelToken = CancellationTokenSource.CreateLinkedTokenSource(_cancelTokenSource.Token, ParentCancelToken.Value).Token;
/*else
_cancelToken = _cancelTokenSource.Token;*/


_lastHeartbeat = DateTime.UtcNow; _lastHeartbeat = DateTime.UtcNow;
await _engine.Connect(Host, _cancelToken).ConfigureAwait(false); await _engine.Connect(Host, _cancelToken).ConfigureAwait(false);


Loading…
Cancel
Save