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

Minor cleanup

Browse Source
This commit is contained in:
RogueException
2015-10-12 00:44:26 -03:00
parent e6f370560f
commit 3ea49a4596
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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);