Skip to content

NetworkTarget - Avoid unhandled exception when using ThrowExceptions=true #5327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snakefoot merged 1 commit into from
Aug 25, 2023
Merged

NetworkTarget - Avoid unhandled exception when using ThrowExceptions=true #5327

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 25 additions & 7 deletions src/NLog/Internal/NetworkSenders/QueuedNetworkSender.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,25 +95,25 @@ protected override void DoSend(byte[] bytes, int offset, int length, AsyncContin
switch (OnQueueOverflow)
{
case NetworkTargetQueueOverflowAction.Discard:
InternalLogger.Debug("NetworkQueue - Discarding single item, because queue is full");
InternalLogger.Debug("NetworkTarget - Discarding single item, because queue is full");
OnLogEventDropped(this, NetworkLogEventDroppedEventArgs.MaxQueueOverflow);
var dequeued = _pendingRequests.Dequeue();
dequeued.AsyncContinuation?.Invoke(null);
break;

case NetworkTargetQueueOverflowAction.Grow:
InternalLogger.Debug("NetworkQueue - Growing the size of queue, because queue is full");
InternalLogger.Debug("NetworkTarget - Growing the size of queue, because queue is full");
MaxQueueSize *= 2;
break;

case NetworkTargetQueueOverflowAction.Block:
while (_pendingRequests.Count >= MaxQueueSize && _pendingError is null)
{
InternalLogger.Debug("NetworkQueue - Blocking until ready, because queue is full");
InternalLogger.Debug("NetworkTarget - Blocking until ready, because queue is full");
System.Threading.Monitor.Wait(_pendingRequests);
InternalLogger.Trace("NetworkQueue - Entered critical section.");
InternalLogger.Trace("NetworkTarget - Entered critical section for queue.");
}
InternalLogger.Trace("NetworkQueue - Limit ok.");
InternalLogger.Trace("NetworkTarget - Queue Limit ok.");
break;
}
}
Expand Down Expand Up @@ -205,8 +205,26 @@ protected void BeginInitialize()
}
}

asyncContinuation?.Invoke(pendingException); // Will attempt to close socket on error
return DequeueNextItem();
try
{
asyncContinuation?.Invoke(pendingException); // Will attempt to close socket on error
return DequeueNextItem();
}
catch (Exception ex)
{
#if DEBUG
if (ex.MustBeRethrownImmediately())
{
throw; // Throwing exceptions here will crash the entire application
}
#endif

if (_pendingError is null)
InternalLogger.Error(ex, "NetworkTarget: Error completing network request");
else
InternalLogger.Error(ex, "NetworkTarget: Error completing failed network request");
return null;
}
}

protected abstract void BeginRequest(NetworkRequestArgs eventArgs);
Expand Down