squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove default pool, it's used automatically anyway.

Browse Source
This commit is contained in:
lain 2019-01-01 13:49:24 +01:00
parent f5d7b0003e
commit d4799e0dc2
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/pleroma/http/connection.ex
View File

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

1
lib/pleroma/http/http.ex
View File

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

3
lib/pleroma/web/activity_pub/activity_pub.ex
View File

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