Merge pull request #1163 from eddyzanda/develop

Thrift connection timeout #1159

Author: gmarz

src/Connections/Elasticsearch.Net.Connection.Thrift/ThriftConnection.cs

@@ -43,7 +43,7 @@ public ThriftConnection(IConnectionConfigurationValues connectionSettings)
 				{
 					var host = uri.Host;
 					var port = uri.Port;
-					var tsocket = new TSocket(host, port);
+                    var tsocket = new TSocket(host, port, this._connectionSettings.Timeout);
 					var transport = new TBufferedTransport(tsocket, 1024);
 					var protocol = new TBinaryProtocol(transport);
 					var client = new Rest.Client(protocol);

src/Connections/Elasticsearch.Net.Connection.Thrift/Transport/TSocket.cs

@@ -118,7 +118,15 @@ public override void Open()
 				InitSocket();
 			}
 
-			client.Connect(host, port);
+            
+		    var connectionRequest = client.BeginConnect(host, port, null, null);
+            var connected = connectionRequest.AsyncWaitHandle.WaitOne(timeout);
+
+		    if (!connected)
+		    {
+                throw new TTransportException("Failed to connect");
+		    }
+
 			inputStream = client.GetStream();
 			outputStream = client.GetStream();
 		}