rewrite 502 as 503

src/main/scala/com/ing/wbaa/rokku/proxy/api/ProxyService.scala

@@ -17,7 +17,8 @@ import com.ing.wbaa.rokku.proxy.provider.aws.AwsErrorCodes
 
 import java.util.UUID
 import java.util.concurrent.TimeUnit
-import scala.concurrent.{ ExecutionContext, Future }
+import scala.concurrent.{ Await, ExecutionContext, Future }
+import scala.concurrent.duration.Duration
 import scala.util.{ Failure, Success }
 
 trait ProxyService {
@@ -132,14 +133,16 @@ trait ProxyService {
     updateHeadersForRequest(httpRequest) { newHttpRequest =>
       val httpResponse = executeRequest(newHttpRequest, userSTS, s3Request).andThen {
         case Success(response: HttpResponse) =>
-          if (response.status == StatusCodes.BadGateway) {
-            logger.info("Got 502, rewriting as 503 to debug")
-            throw new RokkuThrottlingException("Got 502, rewriting as 503")
-          }
           logger.info("Completing request correctly with headers: {}", response.headers)
           handlePostRequestActions(response, httpRequest, s3Request, userSTS)
       }
-      complete(httpResponse)
+      val evaluatedResponse = Await.result(httpResponse, Duration("60 seconds"))
+      if (evaluatedResponse.status == StatusCodes.BadGateway) {
+        logger.info("Got 502, rewriting as 503 to debug")
+        throw new RokkuThrottlingException("Got 502, rewriting as 503")
+      }
+      logger.info("Completing request correctly, so no exceptions")
+      complete(evaluatedResponse)
     }
   }