Make sure RequestTimeout == PingTimeout for Ping requests

Author: gmarz

src/Nest/ElasticClient-Ping.cs

@@ -18,9 +18,14 @@ public IPingResponse Ping(Func<PingDescriptor, PingDescriptor> pingSelector = nu
 			pingSelector = pingSelector ?? (s => s);
 			return this.Dispatch<PingDescriptor, PingRequestParameters, PingResponse>(
 				pingSelector,
-				(p, d) => this.RawDispatch.PingDispatch<PingResponse>(
-					p.DeserializationState(new PingConverter(DeserializePingResponse))
-				)
+				(p, d) => 
+				{	
+					SetRequestTimeout(d);
+					return this.RawDispatch.PingDispatch<PingResponse>(
+						p.DeserializationState(new PingConverter(DeserializePingResponse))
+					);
+				}
+
 			);
 		}
 
@@ -30,9 +35,13 @@ public Task<IPingResponse> PingAsync(Func<PingDescriptor, PingDescriptor> pingSe
 			pingSelector = pingSelector ?? (s => s);
 			return this.DispatchAsync<PingDescriptor, PingRequestParameters, PingResponse, IPingResponse>(
 				pingSelector,
-				(p, d) => this.RawDispatch.PingDispatchAsync<PingResponse>(
-					p.DeserializationState(new PingConverter(DeserializePingResponse))
-				)
+				(p, d) =>
+				{
+					SetRequestTimeout(d);
+					return this.RawDispatch.PingDispatchAsync<PingResponse>(
+					   p.DeserializationState(new PingConverter(DeserializePingResponse))
+					);
+				}
 			);
 		}
 
@@ -41,9 +50,13 @@ public IPingResponse Ping(IPingRequest pingRequest)
 		{
 			return this.Dispatch<IPingRequest, PingRequestParameters, PingResponse>(
 				pingRequest,
-				(p, d) => this.RawDispatch.PingDispatch<PingResponse>(
-					p.DeserializationState(new PingConverter(DeserializePingResponse))
-				)
+				(p, d) =>
+				{
+					SetRequestTimeout(d);
+					return this.RawDispatch.PingDispatch<PingResponse>(
+						p.DeserializationState(new PingConverter(DeserializePingResponse))
+					);
+				}
 			);
 		}
 
@@ -52,12 +65,22 @@ public Task<IPingResponse> PingAsync(IPingRequest pingRequest)
 		{
 			return this.DispatchAsync<IPingRequest, PingRequestParameters, PingResponse, IPingResponse>(
 				pingRequest,
-				(p, d) => this.RawDispatch.PingDispatchAsync<PingResponse>(
-					p.DeserializationState(new PingConverter(DeserializePingResponse))
-				)
+				(p, d) =>
+				{
+					SetRequestTimeout(d);
+					return this.RawDispatch.PingDispatchAsync<PingResponse>(
+						p.DeserializationState(new PingConverter(DeserializePingResponse))
+					);
+				}
 			);
 		}
 
+		private void SetRequestTimeout(IRequest<PingRequestParameters> pingRequest)
+		{
+			if (this._connectionSettings.PingTimeout.HasValue)
+				pingRequest.RequestConfiguration.RequestTimeout = this._connectionSettings.PingTimeout.Value;
+		}
+
 		private PingResponse DeserializePingResponse(IElasticsearchResponse response, Stream stream)
 		{
 			return new PingResponse(response);