Merge pull request #285 from disaacson/tcptimeouts

Allow clients to specify TCP timeouts

Author: nirvdrum

java/client/src/org/openqa/selenium/remote/internal/HttpClientFactory.java

@@ -50,12 +50,17 @@
 public class HttpClientFactory {
 
   private final CloseableHttpClient httpClient;
-  private final int TIMEOUT_THREE_HOURS = (int) SECONDS.toMillis(60 * 60 * 3);
+  private static final int TIMEOUT_THREE_HOURS = (int) SECONDS.toMillis(60 * 60 * 3);
+  private static final int TIMEOUT_TWO_MINUTES = (int) SECONDS.toMillis(60 * 2);
   private final HttpClientConnectionManager gridClientConnectionManager =
       getClientConnectionManager();
 
   public HttpClientFactory() {
-    httpClient = createHttpClient(null);
+    this(TIMEOUT_TWO_MINUTES, TIMEOUT_THREE_HOURS);
+  }
+
+  public HttpClientFactory(int connectionTimeout, int socketTimeout) {
+    httpClient = createHttpClient(null, connectionTimeout, socketTimeout);
   }
 
   private static HttpClientConnectionManager getClientConnectionManager() {
@@ -77,12 +82,25 @@ public HttpClient getHttpClient() {
   }
 
   public CloseableHttpClient createHttpClient(Credentials credentials) {
+      return createHttpClient(credentials, TIMEOUT_TWO_MINUTES, TIMEOUT_THREE_HOURS);
+  }
+
+  public CloseableHttpClient createHttpClient(Credentials credentials, int connectionTimeout, int socketTimeout) {
+    if (connectionTimeout <= 0) {
+        throw new IllegalArgumentException("connection timeout must be > 0");
+    }
+    if (socketTimeout <= 0) {
+        throw new IllegalArgumentException("socket timeout must be > 0");
+    }
+
+    SocketConfig socketConfig = createSocketConfig(socketTimeout);
+    RequestConfig requestConfig = createRequestConfig(connectionTimeout, socketTimeout);
+
     HttpClientBuilder builder = HttpClientBuilder.create()
         .setConnectionManager(getClientConnectionManager())
-        .setDefaultSocketConfig(createSocketConfig())
-        .setDefaultSocketConfig(createSocketConfig())
-        .setRoutePlanner(createRoutePlanner())
-        .setDefaultRequestConfig(createRequestConfig());
+        .setDefaultSocketConfig(createSocketConfig(socketTimeout))
+        .setDefaultRequestConfig(createRequestConfig(connectionTimeout, socketTimeout))
+        .setRoutePlanner(createRoutePlanner());
 
     if (credentials != null) {
       CredentialsProvider provider = new BasicCredentialsProvider();
@@ -93,17 +111,11 @@ public CloseableHttpClient createHttpClient(Credentials credentials) {
     return builder.build();
   }
 
-  public HttpClient getGridHttpClient(int connection_timeout, int socket_timeout) {
+  public HttpClient getGridHttpClient(int connectionTimeout, int socketTimeout) {
     gridClientConnectionManager.closeIdleConnections(100, MILLISECONDS);
 
-    SocketConfig socketConfig = SocketConfig.copy(createSocketConfig())
-        .setSoTimeout(socket_timeout > 0 ? socket_timeout : TIMEOUT_THREE_HOURS)
-        .build();
-
-    RequestConfig requestConfig = RequestConfig.copy(createRequestConfig())
-        .setConnectTimeout(connection_timeout > 0 ? connection_timeout : 120 * 1000)
-        .setSocketTimeout(socket_timeout > 0 ? socket_timeout : TIMEOUT_THREE_HOURS)
-        .build();
+    SocketConfig socketConfig = createSocketConfig(socketTimeout);
+    RequestConfig requestConfig = createRequestConfig(connectionTimeout, socketTimeout);
 
     return HttpClientBuilder.create()
         .setConnectionManager(gridClientConnectionManager)
@@ -114,18 +126,18 @@ public HttpClient getGridHttpClient(int connection_timeout, int socket_timeout)
         .build();
   }
 
-  private SocketConfig createSocketConfig() {
+  private SocketConfig createSocketConfig(int socketTimeout) {
     return SocketConfig.custom()
         .setSoReuseAddress(true)
-        .setSoTimeout(TIMEOUT_THREE_HOURS)
+        .setSoTimeout(socketTimeout)
         .build();
   }
 
-  private RequestConfig createRequestConfig() {
+  private RequestConfig createRequestConfig(int connectionTimeout, int socketTimeout) {
     return RequestConfig.custom()
         .setStaleConnectionCheckEnabled(true)
-        .setConnectTimeout(120 * 1000)
-        .setSocketTimeout(TIMEOUT_THREE_HOURS)
+        .setConnectTimeout(connectionTimeout)
+        .setSocketTimeout(socketTimeout)
         .build();
   }