diff options
| author | kaniini <nenolod@gmail.com> | 2019-01-01 20:12:34 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-01-01 20:12:34 +0000 |
| commit | 32bed664714c616d4a75579b450e52dcff5d8134 (patch) | |
| tree | 88d5c48035cf1cb874c14caeb9f3ae33cff5c71e /lib | |
| parent | 34fa7090158315eb0c8304c6b496f23338f9e1c6 (diff) | |
| parent | 096a92780541e76229400ad9ee5b990b5e1b4d1f (diff) | |
| download | pleroma-32bed664714c616d4a75579b450e52dcff5d8134.tar.gz | |
Merge branch 'pool-usage' into 'develop'
Update of hackney and tesla, removal of superflous default options.
See merge request pleroma/pleroma!614
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/http/connection.ex | 1 | ||||
| -rw-r--r-- | lib/pleroma/http/http.ex | 1 | ||||
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 3 |
3 files changed, 1 insertions, 4 deletions
diff --git a/lib/pleroma/http/connection.ex b/lib/pleroma/http/connection.ex index 1c3187768..699d80cd7 100644 --- a/lib/pleroma/http/connection.ex +++ b/lib/pleroma/http/connection.ex @@ -8,7 +8,6 @@ defmodule Pleroma.HTTP.Connection do """ @hackney_options [ - pool: :default, timeout: 10000, recv_timeout: 20000, follow_redirect: true diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex index f12f33566..b8103cef6 100644 --- a/lib/pleroma/http/http.ex +++ b/lib/pleroma/http/http.ex @@ -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 diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index b9b95a0e9..4d754de13 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -741,8 +741,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do {"Content-Type", "application/activity+json"}, {"signature", signature}, {"digest", digest} - ], - hackney: [pool: :default] + ] ) end |