diff options
| author | lain <lain@soykaf.club> | 2019-01-01 13:49:24 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-01-01 13:49:24 +0100 |
| commit | d4799e0dc23605563a29d14ad4657183174b55f9 (patch) | |
| tree | 539ea64d713b277c35c50a371154c6a23107a4e7 /lib | |
| parent | f5d7b0003ea200d13abca2cbd4e4f59db9658231 (diff) | |
| download | pleroma-d4799e0dc23605563a29d14ad4657183174b55f9.tar.gz | |
Remove default pool, it's used automatically anyway.
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 35c1490da..e2e92857f 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 32d9cf5aa..0a46c11b5 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 167471b7b..c8c2905a7 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 |