From 0b486ccf446c6480dc59c60c41af1fc002c2a6a7 Mon Sep 17 00:00:00 2001 From: Steve Farmer Date: Tue, 21 Mar 2017 22:50:24 -0400 Subject: [PATCH] Increase Warp connection timeout (#834) --- CHANGELOG.md | 1 + main/Main.hs | 1 + stack.yaml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d62b043f..8dab99015 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed +- #827, Avoid Warp reaper, extend socket timeout to 1 hour - @majorcode - #791, malformed nested JSON error - @diogob - Resource embedding in views referencing tables in public schema - @fab1an - #831, Fix proc resource embedding issue with search_path - @steve-chavez diff --git a/main/Main.hs b/main/Main.hs index 4e42bc975..b9035d948 100644 --- a/main/Main.hs +++ b/main/Main.hs @@ -57,6 +57,7 @@ main = do appSettings = setHost ((fromString . toS) host) . setPort port . setServerName (toS $ "postgrest/" <> prettyVersion) + . setTimeout 3600 $ defaultSettings when (isMalformedProxyUri $ toS <$> proxy) $ panic diff --git a/stack.yaml b/stack.yaml index d2b49a461..818c3bc97 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-8.0 +resolver: lts-8.5 extra-deps: - Ranged-sets-0.3.0 - hasql-pool-0.4.1