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

2019-03-07 23:49:02 +00:00 · 2019-03-07 23:49:02 +00:00 · 19afd9f81f
parent 773f532b14
commit 19afd9f81f
4 changed files with 2 additions and 5 deletions
--- 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
  ]
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@ -1452,7 +1452,6 @@ def suggestions(%{assigns: %{user: user}} = conn, _) do
               url,
               [],
               adapter: [
-                 timeout: timeout,
                 recv_timeout: timeout,
                 pool: :default
               ]
--- a/lib/pleroma/web/rel_me.ex
+++ b/lib/pleroma/web/rel_me.ex
@ -5,7 +5,6 @@
 defmodule Pleroma.Web.RelMe do
  @hackney_options [
    pool: :media,
-    timeout: 2_000,
    recv_timeout: 2_000,
    max_body: 2_000_000
  ]
--- a/lib/pleroma/web/rich_media/parser.ex
+++ b/lib/pleroma/web/rich_media/parser.ex
@ -11,7 +11,6 @@ defmodule Pleroma.Web.RichMedia.Parser do

  @hackney_options [
    pool: :media,
-    timeout: 2_000,
    recv_timeout: 2_000,
    max_body: 2_000_000
  ]