Fixing Issue NLog#1058

Deadlock in NetworkTarget Issue NLog#1058 Fix.
kt1996 · Dec 25, 2015 · f564030 · f564030
1 parent fd705e3
commit f564030
Showing 1 changed file with 25 additions and 23 deletions.
diff --git a/src/NLog/Targets/NetworkTarget.cs b/src/NLog/Targets/NetworkTarget.cs
@@ -271,11 +271,12 @@ protected override void Write(AsyncLogEventInfo logEvent)
             else
             {
 
+                NetworkSender sender;
+                LinkedListNode<NetworkSender> linkedListNode;
+
                 lock (this.openNetworkSenders)
                 {
-
-
-                    //handle to many connections
+                    //handle too many connections
                     var tooManyConnections = this.openNetworkSenders.Count >= MaxConnections;
 
                     if (tooManyConnections && MaxConnections > 0)
@@ -304,33 +305,34 @@ protected override void Write(AsyncLogEventInfo logEvent)
                         }
                     }
 
-                    var sender = this.SenderFactory.Create(address, MaxQueueSize);
+                    sender = this.SenderFactory.Create(address, MaxQueueSize);
                     sender.Initialize();
 
-                    var linkedListNode = this.openNetworkSenders.AddLast(sender);
-                    this.ChunkedSend(
-                        sender,
-                        bytes,
-                        ex =>
+                    linkedListNode = this.openNetworkSenders.AddLast(sender);
+                }
+                this.ChunkedSend(
+                    sender,
+                    bytes,
+                    ex =>
+                    {
+                        lock (this.openNetworkSenders)
                         {
-                            lock (this.openNetworkSenders)
+                            TryRemove(this.openNetworkSenders, linkedListNode);
+                            if (this.OnConnectionOverflow == NetworkTargetConnectionsOverflowAction.Block)
                             {
-                                TryRemove(this.openNetworkSenders, linkedListNode);
-                                if (this.OnConnectionOverflow == NetworkTargetConnectionsOverflowAction.Block)
-                                {
-                                    System.Threading.Monitor.PulseAll(this.openNetworkSenders);
-                                }
+                                System.Threading.Monitor.PulseAll(this.openNetworkSenders);
                             }
+                        }
 
-                            if (ex != null)
-                            {
-                                InternalLogger.Error("Error when sending {0}", ex);
-                            }
+                        if (ex != null)
+                        {
+                            InternalLogger.Error("Error when sending {0}", ex);
+                        }
 
-                            sender.Close(ex2 => { });
-                            logEvent.Continuation(ex);
-                        });
-                }
+                        sender.Close(ex2 => { });
+                        logEvent.Continuation(ex);
+                });
+
             }
         }