aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/http
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2019-03-07 23:49:02 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2019-03-08 22:56:16 +0000
commit19afd9f81ff0b0e966a432db6ea15930d3712c85 (patch)
tree6957e177d77defbd07b14aca610c560b0cbd2345 /lib/pleroma/http
parent773f532b148eb0c9ca1e73c3b4ebaf6aa8337da9 (diff)
downloadpleroma-19afd9f81ff0b0e966a432db6ea15930d3712c85.tar.gz
http: rework connection timeouts to match hackney docs, enforce 1 second max TCP connection timeout
Diffstat (limited to 'lib/pleroma/http')
-rw-r--r--lib/pleroma/http/connection.ex4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/http/connection.ex b/lib/pleroma/http/connection.ex
index cc2e96e2b..926f892ba 100644
--- a/lib/pleroma/http/connection.ex
+++ b/lib/pleroma/http/connection.ex
@@ -8,8 +8,8 @@ defmodule Pleroma.HTTP.Connection do
"""
@hackney_options [
- timeout: 10000,
- recv_timeout: 20000,
+ connect_timeout: 1_000,
+ recv_timeout: 10_000,
follow_redirect: true,
pool: :federation
]