Add timeout to dash connections

Fixes #545.

--
MOS_MIGRATED_REVID=118059971

1 files changed, 8 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/dash/DashModule.java b/src/main/java/com/google/devtools/build/lib/bazel/dash/DashModule.java
index 222223db29..ac46df5d51 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/dash/DashModule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/dash/DashModule.java
@@ -45,6 +45,9 @@ import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ByteArrayEntity;
 import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.params.BasicHttpParams;
+import org.apache.http.params.HttpConnectionParams;
+import org.apache.http.params.HttpParams;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -308,7 +311,11 @@ public class DashModule extends BlazeModule {
 
     private void sendMessage(final String suffix, final HttpEntity message)
         throws SenderException {
-      HttpClient httpClient = new DefaultHttpClient();
+      HttpParams httpParams = new BasicHttpParams();
+      HttpConnectionParams.setConnectionTimeout(httpParams, 5000);
+      HttpConnectionParams.setSoTimeout(httpParams, 5000);
+      HttpClient httpClient = new DefaultHttpClient(httpParams);
+
       HttpPost httppost = new HttpPost(url + "/" + suffix + "/" + buildId);
       if (message != null) {
         httppost.setHeader(HttpHeaders.CONTENT_TYPE, "application/x-protobuf");