alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

http: rework connection timeouts to match hackney docs, enforce 1 second max TCP connection timeout

This commit is contained in:
William Pitcock 2019-03-07 23:49:02 +00:00
parent 773f532b14
commit 19afd9f81f
4 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/http/connection.ex
View File

@ -8,8 +8,8 @@ defmodule Pleroma.HTTP.Connection do
""" """
@hackney_options [ @hackney_options [
timeout: 10000, connect_timeout: 1_000,
recv_timeout: 20000, recv_timeout: 10_000,
follow_redirect: true, follow_redirect: true,
pool: :federation pool: :federation
] ]

1
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View File

@ -1452,7 +1452,6 @@ def suggestions(%{assigns: %{user: user}} = conn, _) do
url, url,
[], [],
adapter: [ adapter: [
timeout: timeout,
recv_timeout: timeout, recv_timeout: timeout,
pool: :default pool: :default
] ]

1
lib/pleroma/web/rel_me.ex
View File

@ -5,7 +5,6 @@
defmodule Pleroma.Web.RelMe do defmodule Pleroma.Web.RelMe do
@hackney_options [ @hackney_options [
pool: :media, pool: :media,
timeout: 2_000,
recv_timeout: 2_000, recv_timeout: 2_000,
max_body: 2_000_000 max_body: 2_000_000
] ]

1
lib/pleroma/web/rich_media/parser.ex
View File

@ -11,7 +11,6 @@ defmodule Pleroma.Web.RichMedia.Parser do
@hackney_options [ @hackney_options [
pool: :media, pool: :media,
timeout: 2_000,
recv_timeout: 2_000, recv_timeout: 2_000,
max_body: 2_000_000 max_body: 2_000_000
] ]