Merge branch 'pool-usage' into 'develop'

Update of hackney and tesla, removal of superflous default options.

See merge request pleroma/pleroma!614
This commit is contained in:
kaniini 2019-01-01 20:12:34 +00:00
commit 32bed66471
4 changed files with 9 additions and 12 deletions

View file

@ -8,7 +8,6 @@ defmodule Pleroma.HTTP.Connection do
"""
@hackney_options [
pool: :default,
timeout: 10000,
recv_timeout: 20000,
follow_redirect: true

View file

@ -56,7 +56,6 @@ defmodule Pleroma.HTTP do
def process_request_options(options) do
config = Application.get_env(:pleroma, :http, [])
proxy = Keyword.get(config, :proxy_url, nil)
options = options ++ [adapter: [pool: :default]]
case proxy do
nil -> options

View file

@ -741,8 +741,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
{"Content-Type", "application/activity+json"},
{"signature", signature},
{"digest", digest}
],
hackney: [pool: :default]
]
)
end