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

Provide more information during MessageQueue warnings

Browse Source
This commit is contained in:
RogueException
2016-02-21 23:09:52 -04:00
parent c387e04c09
commit 0ec7218ad0
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Discord.Net/MessageQueue.cs
View File

@@ -33,11 +33,16 @@ namespace Discord.Net
private readonly ConcurrentQueue<MessageEdit> _pendingEdits; private readonly ConcurrentQueue<MessageEdit> _pendingEdits;
private readonly ConcurrentQueue<Message> _pendingDeletes; private readonly ConcurrentQueue<Message> _pendingDeletes;
private readonly ConcurrentDictionary<int, string> _pendingSendsByNonce; private readonly ConcurrentDictionary<int, string> _pendingSendsByNonce;
private int _nextWarning; private int _count, _nextWarning;
private int _count;
/// <summary> Gets the current number of queued actions. </summary> /// <summary> Gets the current number of queued actions. </summary>
public int Count => _count; public int Count => _count;
/// <summary> Gets the current number of queued sends. </summary>
public int SendCount => _pendingSends.Count;
/// <summary> Gets the current number of queued edits. </summary>
public int EditCount => _pendingEdits.Count;
/// <summary> Gets the current number of queued deletes. </summary>
public int DeleteCount => _pendingDeletes.Count;
internal MessageQueue(RestClient rest, Logger logger) internal MessageQueue(RestClient rest, Logger logger)
{ {
@@ -218,8 +223,12 @@ namespace Discord.Net
int count = Interlocked.Increment(ref _count); int count = Interlocked.Increment(ref _count);
if (count >= _nextWarning) if (count >= _nextWarning)
{ {
_nextWarning *= 2; _nextWarning <<= 1;
_logger.Warning($"Queue is backed up, currently at {count} actions."); int sendCount = _pendingSends.Count;
int editCount = _pendingEdits.Count;
int deleteCount = _pendingDeletes.Count;
count = sendCount + editCount + deleteCount; //May not add up due to async
_logger.Warning($"Queue is backed up, currently at {count} actions ({sendCount} sends, {editCount} edits, {deleteCount} deletes).");
} }
else if (count < WarningStart) //Reset once the problem is solved else if (count < WarningStart) //Reset once the problem is solved
_nextWarning = WarningStart; _nextWarning = WarningStart;