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

Removed unused canceltoken

Browse Source
This commit is contained in:
RogueException
2017-04-19 14:49:04 -03:00
parent 5dba95fe59
commit ff67c0d9c3
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Discord.Net.Rest/Net/DefaultRestClient.cs
View File

@@ -19,8 +19,7 @@ namespace Discord.Net.Rest
private readonly HttpClient _client; private readonly HttpClient _client;
private readonly string _baseUrl; private readonly string _baseUrl;
private readonly JsonSerializer _errorDeserializer; private readonly JsonSerializer _errorDeserializer;
private CancellationTokenSource _cancelTokenSource; private CancellationToken _cancelToken;
private CancellationToken _cancelToken, _parentToken;
private bool _isDisposed; private bool _isDisposed;
public DefaultRestClient(string baseUrl) public DefaultRestClient(string baseUrl)
@@ -35,9 +34,7 @@ namespace Discord.Net.Rest
}); });
SetHeader("accept-encoding", "gzip, deflate"); SetHeader("accept-encoding", "gzip, deflate");
_cancelTokenSource = new CancellationTokenSource();
_cancelToken = CancellationToken.None; _cancelToken = CancellationToken.None;
_parentToken = CancellationToken.None;
_errorDeserializer = new JsonSerializer(); _errorDeserializer = new JsonSerializer();
} }
private void Dispose(bool disposing) private void Dispose(bool disposing)
@@ -62,8 +59,7 @@ namespace Discord.Net.Rest
} }
public void SetCancelToken(CancellationToken cancelToken) public void SetCancelToken(CancellationToken cancelToken)
{ {
_parentToken = cancelToken; _cancelToken = cancelToken;
_cancelToken = CancellationTokenSource.CreateLinkedTokenSource(_parentToken, _cancelTokenSource.Token).Token;
} }
public async Task<RestResponse> SendAsync(string method, string endpoint, CancellationToken cancelToken, bool headerOnly) public async Task<RestResponse> SendAsync(string method, string endpoint, CancellationToken cancelToken, bool headerOnly)