Merge pull request #3415 from snakefoot/NetCoreAsyncQueueDeadlock

ConcurrentRequestQueue - Fixed deadlock caused by misunderstanding Monitor.Wait
NLog · May 22, 2019 · 54b5180 · 54b5180
2 parents df0c1b6 + ed250c1
commit 54b5180
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/src/NLog/Targets/Wrappers/ConcurrentRequestQueue.cs b/src/NLog/Targets/Wrappers/ConcurrentRequestQueue.cs
@@ -127,21 +127,13 @@ private long WaitForBelowRequestLimit()
                 // If yield did not help, then wait on a lock
                 while (currentCount > RequestLimit)
                 {
+                    InternalLogger.Debug("Blocking because the overflow action is Block...");
                     if (!lockTaken)
-                    {
-                        InternalLogger.Debug("Blocking because the overflow action is Block...");
                         Monitor.Enter(_logEventInfoQueue);
-                        lockTaken = true;
-                        InternalLogger.Trace("Entered critical section.");
-                    }
                     else
-                    {
-                        InternalLogger.Debug("Blocking because the overflow action is Block...");
-                        if (!Monitor.Wait(_logEventInfoQueue, 100))
-                            lockTaken = false;
-                        else
-                            InternalLogger.Trace("Entered critical section.");
-                    }
+                        Monitor.Wait(_logEventInfoQueue);
+                    lockTaken = true;
+                    InternalLogger.Trace("Entered critical section.");
                     currentCount = Interlocked.Read(ref _count);
                 }