From c435eccc43bedb2fe3b8cabe8755220b63f596e8 Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane@kilkelly.me>
Date: Tue, 11 Dec 2018 09:24:09 +0000
Subject: [PATCH] Change push timeout to three minutes

---
 .../uk/ac/ic/wlgitbridge/snapshot/push/PostbackPromise.java     | 2 +-
 .../snapshot/push/exception/PostbackTimeoutException.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/push/PostbackPromise.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/push/PostbackPromise.java
index 37e03e39bf..766ed23a1d 100644
--- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/push/PostbackPromise.java
+++ b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/push/PostbackPromise.java
@@ -35,7 +35,7 @@ public class PostbackPromise {
         try {
             while (!received) {
                 try {
-                    if (!cond.await(60, TimeUnit.SECONDS)) {
+                    if (!cond.await(60 * 3, TimeUnit.SECONDS)) {
                         throw new PostbackTimeoutException();
                     }
                 } catch (InterruptedException e) {
diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/push/exception/PostbackTimeoutException.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/push/exception/PostbackTimeoutException.java
index 8b1f6a69a8..2b1579cd3e 100644
--- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/push/exception/PostbackTimeoutException.java
+++ b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/push/exception/PostbackTimeoutException.java
@@ -13,7 +13,7 @@ public class PostbackTimeoutException extends SevereSnapshotPostException {
 
     @Override
     public String getMessage() {
-        return "timeout (60s)";
+        return "timeout";
     }
 
     @Override