From 3ea49a459639ebb65defaef7037d76e93b566e34 Mon Sep 17 00:00:00 2001 From: RogueException Date: Mon, 12 Oct 2015 00:44:26 -0300 Subject: [PATCH] Minor cleanup --- src/Discord.Net/WebSockets/WebSocket.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Discord.Net/WebSockets/WebSocket.cs b/src/Discord.Net/WebSockets/WebSocket.cs index e9b0ef62e..9ee9a6141 100644 --- a/src/Discord.Net/WebSockets/WebSocket.cs +++ b/src/Discord.Net/WebSockets/WebSocket.cs @@ -74,7 +74,7 @@ namespace Discord.WebSockets _engine.ProcessMessage += async (s, e) => { if (_logLevel >= LogMessageSeverity.Debug) - RaiseOnLog(LogMessageSeverity.Debug, $"In: " + e.Message); + RaiseOnLog(LogMessageSeverity.Debug, $"In: {e.Message}"); await ProcessMessage(e.Message); }; } @@ -86,14 +86,12 @@ namespace Discord.WebSockets try { - await Disconnect().ConfigureAwait(false); + await Disconnect().ConfigureAwait(false); - _cancelTokenSource = new CancellationTokenSource(); if (ParentCancelToken == null) throw new InvalidOperationException("Parent cancel token was never set."); + _cancelTokenSource = new CancellationTokenSource(); _cancelToken = CancellationTokenSource.CreateLinkedTokenSource(_cancelTokenSource.Token, ParentCancelToken.Value).Token; - /*else - _cancelToken = _cancelTokenSource.Token;*/ _lastHeartbeat = DateTime.UtcNow; await _engine.Connect(Host, _cancelToken).ConfigureAwait(false);