diff options
author | vlad <vlad@driver.xyz> | 2017-03-27 10:57:45 -0700 |
---|---|---|
committer | vlad <vlad@driver.xyz> | 2017-03-27 10:57:45 -0700 |
commit | a03bef1436774e8937a90df2927babc52608d150 (patch) | |
tree | 6681abdf33f804fa63de11505ea3e6778186c166 | |
parent | 27ba1f6dc2d58e6e1d33d5b9d1b5b677c451b841 (diff) | |
download | driver-core-a03bef1436774e8937a90df2927babc52608d150.tar.gz driver-core-a03bef1436774e8937a90df2927babc52608d150.tar.bz2 driver-core-a03bef1436774e8937a90df2927babc52608d150.zip |
Hopefully fixing 504s
-rw-r--r-- | src/main/scala/xyz/driver/core/rest.scala | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/scala/xyz/driver/core/rest.scala b/src/main/scala/xyz/driver/core/rest.scala index d3a06d2..e812eaf 100644 --- a/src/main/scala/xyz/driver/core/rest.scala +++ b/src/main/scala/xyz/driver/core/rest.scala @@ -5,7 +5,6 @@ import akka.http.scaladsl.Http import akka.http.scaladsl.model._ import akka.http.scaladsl.model.headers.{HttpChallenges, RawHeader} import akka.http.scaladsl.server.AuthenticationFailedRejection.CredentialsRejected -import akka.http.scaladsl.server.Directive0 import akka.http.scaladsl.unmarshalling.Unmarshal import akka.http.scaladsl.unmarshalling.Unmarshaller import akka.stream.ActorMaterializer @@ -294,7 +293,10 @@ package rest { } else if (response.status.isFailure()) { throw new Exception(s"Http status is failure ${response.status}") } else { - Unmarshal(response.entity) + val entity = response.entity + // See https://github.com/akka/akka/issues/19538 + entity.toStrict(5000L, materializer) + Unmarshal(entity) } } } |