From b328d85230f94e2e33aec3aeedc817197dbd4db5 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Mon, 27 Jul 2015 22:46:38 -0700
Subject: [PATCH] Increase timeout on push service socket.

// FREEBIE
---
 .../textsecuregcm/WhisperServerService.java        | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index fed75b10c..60931fb83 100644
--- a/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -22,6 +22,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.google.common.base.Optional;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.eclipse.jetty.servlets.CrossOriginFilter;
+import org.glassfish.jersey.client.ClientProperties;
 import org.skife.jdbi.v2.DBI;
 import org.whispersystems.dispatch.DispatchChannel;
 import org.whispersystems.dispatch.DispatchManager;
@@ -158,8 +159,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     RedisClientFactory cacheClientFactory = new RedisClientFactory(config.getCacheConfiguration().getUrl());
     JedisPool          cacheClient        = cacheClientFactory.getRedisClientPool();
     JedisPool          directoryClient    = new RedisClientFactory(config.getDirectoryConfiguration().getUrl()).getRedisClientPool();
-    Client             httpClient         = new JerseyClientBuilder(environment).using(config.getJerseyClientConfiguration())
-                                                                                .build(getName());
+    Client             httpClient         = initializeHttpClient(environment, config);
 
     DirectoryManager           directory                  = new DirectoryManager(directoryClient);
     PendingAccountsManager     pendingAccountsManager     = new PendingAccountsManager(pendingAccounts, cacheClient);
@@ -282,6 +282,16 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     }
   }
 
+  private Client initializeHttpClient(Environment environment, WhisperServerConfiguration config) {
+    Client httpClient = new JerseyClientBuilder(environment).using(config.getJerseyClientConfiguration())
+                                                            .build(getName());
+
+    httpClient.property(ClientProperties.CONNECT_TIMEOUT, 1000);
+    httpClient.property(ClientProperties.READ_TIMEOUT, 1000);
+
+    return httpClient;
+  }
+
   public static void main(String[] args) throws Exception {
     new WhisperServerService().run(args);
   }