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

Removed RetryMode.RetryErrors

Browse Source
This commit is contained in:
RogueException
2016-12-27 17:50:32 -04:00
parent d82d7e1584
commit 1169d3671c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Discord.Net.Core/RetryMode.cs
View File

@@ -10,13 +10,13 @@ namespace Discord
AlwaysFail = 0x0, AlwaysFail = 0x0,
/// <summary> Retry if a request timed out. </summary> /// <summary> Retry if a request timed out. </summary>
RetryTimeouts = 0x1, RetryTimeouts = 0x1,
/// <summary> Retry if a request failed due to a network error. </summary> // /// <summary> Retry if a request failed due to a network error. </summary>
RetryErrors = 0x2, //RetryErrors = 0x2,
/// <summary> Retry if a request failed due to a ratelimit. </summary> /// <summary> Retry if a request failed due to a ratelimit. </summary>
RetryRatelimit = 0x4, RetryRatelimit = 0x4,
/// <summary> Retry if a request failed due to an HTTP error 502. </summary> /// <summary> Retry if a request failed due to an HTTP error 502. </summary>
Retry502 = 0x8, Retry502 = 0x8,
/// <summary> Continuously retry a request until it times out, its cancel token is triggered, or the server responds with a non-502 error. </summary> /// <summary> Continuously retry a request until it times out, its cancel token is triggered, or the server responds with a non-502 error. </summary>
AlwaysRetry = RetryTimeouts | RetryErrors | RetryRatelimit | Retry502, AlwaysRetry = RetryTimeouts | /*RetryErrors |*/ RetryRatelimit | Retry502,
} }
} }

6
src/Discord.Net.Rest/Net/Queue/RequestQueueBucket.cs
View File

@@ -117,7 +117,7 @@ namespace Discord.Net.Queue
return response.Stream; return response.Stream;
} }
} }
catch (HttpException) { throw; } //Pass through //catch (HttpException) { throw; } //Pass through
catch (TimeoutException) catch (TimeoutException)
{ {
#if DEBUG_LIMITS #if DEBUG_LIMITS
@@ -129,7 +129,7 @@ namespace Discord.Net.Queue
await Task.Delay(500); await Task.Delay(500);
continue; //Retry continue; //Retry
} }
catch (Exception) /*catch (Exception)
{ {
#if DEBUG_LIMITS #if DEBUG_LIMITS
Debug.WriteLine($"[{id}] Error"); Debug.WriteLine($"[{id}] Error");
@@ -139,7 +139,7 @@ namespace Discord.Net.Queue
await Task.Delay(500); await Task.Delay(500);
continue; //Retry continue; //Retry
} }*/
finally finally
{ {
UpdateRateLimit(id, request, info, lag, false); UpdateRateLimit(id, request, info, lag, false);