Merge branch 'trivial/increase-hackney-timeouts' into 'develop'

http: bump connection timeout to 10 seconds See merge request pleroma/pleroma!1183
2019-05-21 05:15:29 +00:00 · 2019-05-21 05:15:29 +00:00 · be6b57193a
commit be6b57193a
parent 94caca924d c972d0bb14
2 changed files with 2 additions and 1 deletions
--- a/lib/pleroma/http/connection.ex
+++ b/lib/pleroma/http/connection.ex
@ -8,7 +8,7 @@ defmodule Pleroma.HTTP.Connection do
  """

  @hackney_options [
-    connect_timeout: 2_000,
+    connect_timeout: 10_000,
    recv_timeout: 20_000,
    follow_redirect: true,
    pool: :federation