Merge pull request #6 from dorzeidman/master

Fixed TCP-Client re-connection after socket disconnects

Author: moriyoshi

src/NLog.Targets.Fluentd/Fluentd.cs

@@ -24,7 +24,8 @@
 using NLog;
 using MsgPack;
 using MsgPack.Serialization;
-
+using NLog.Common;
+
 namespace NLog.Targets
 {
     internal class OrdinaryDictionarySerializer: MessagePackSerializer<IDictionary<string, object>>
@@ -193,30 +194,47 @@ public class Fluentd : NLog.Targets.TargetWithLayout
         protected override void InitializeTarget()
         {
             base.InitializeTarget();
+        }
+
+        private void InitializeClient()
+        {
+            client = new TcpClient();
             client.NoDelay = this.NoDelay;
             client.ReceiveBufferSize = this.ReceiveBufferSize;
             client.SendBufferSize = this.SendBufferSize;
             client.SendTimeout = this.SendTimeout;
             client.ReceiveTimeout = this.ReceiveTimeout;
-            client.LingerState = new LingerOption(this.LingerEnabled, this.LingerTime);
+            client.LingerState = new LingerOption(this.LingerEnabled, this.LingerTime);
         }
 
         protected void EnsureConnected()
         {
             try
             {
-                if (!client.Connected)
+                if(client == null)
                 {
-                    client.Connect(this.Host, this.Port);
-                    this.stream = this.client.GetStream();
-                    this.emitter = new FluentdEmitter(this.stream);
+                    InitializeClient();
+                    ConnectClient();
+                }
+                else if (!client.Connected)
+                {
+                    Cleanup();
+                    InitializeClient();
+                    ConnectClient();
                 }
             }
             catch (Exception e)
             {
             }
         }
 
+        private void ConnectClient()
+        {
+            client.Connect(this.Host, this.Port);
+            this.stream = this.client.GetStream();
+            this.emitter = new FluentdEmitter(this.stream);
+        }
+
         protected void Cleanup()
         {
             if (this.stream != null)
@@ -295,7 +313,6 @@ public Fluentd()
             LingerTime = 1000;
             EmitStackTraceWhenAvailable = false;
             Tag = Assembly.GetCallingAssembly().GetName().Name;
-            client = new TcpClient();
         }
     }
 }