Merge pull request #46 from overleaf/sk-increase-push-timeout

Change push timeout to three minutes

services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/push/PostbackPromise.java

@@ -14,6 +14,8 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 public class PostbackPromise {
 
+    private static int TIMEOUT_SECONDS = 60 * 3;
+
     private final String postbackKey;
     private final ReentrantLock lock;
     private final Condition cond;
@@ -35,8 +37,8 @@ public class PostbackPromise {
         try {
             while (!received) {
                 try {
-                    if (!cond.await(60, TimeUnit.SECONDS)) {
-                        throw new PostbackTimeoutException();
+                    if (!cond.await(TIMEOUT_SECONDS, TimeUnit.SECONDS)) {
+                        throw new PostbackTimeoutException(TIMEOUT_SECONDS);
                     }
                 } catch (InterruptedException e) {
                     throw new InternalErrorException();

services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/push/exception/PostbackTimeoutException.java

@@ -11,9 +11,15 @@ import java.util.List;
  */
 public class PostbackTimeoutException extends SevereSnapshotPostException {
 
+    private int timeout;
+
+    public PostbackTimeoutException(int timeout) {
+        this.timeout = timeout;
+    }
+
     @Override
     public String getMessage() {
-        return "timeout (60s)";
+        return "Request timed out (after " + this.timeout + " seconds)";
     }
 
     @Override