Skip to content
Snippets Groups Projects
Commit ae7c79cf authored by kaniini's avatar kaniini
Browse files

Merge branch 'bugfix/fd-exhaustion' into 'develop'

http: enable keepalive / connection pooling (closes #336)

Closes #336

See merge request pleroma/pleroma!393
parents 2d957b98 7338368a
Branches
No related tags found
No related merge requests found
......@@ -19,9 +19,10 @@ defmodule Pleroma.HTTP do
end
end
def process_request_options(options) do
defp process_request_options(options) do
config = Application.get_env(:pleroma, :http, [])
proxy = Keyword.get(config, :proxy_url, nil)
options = options ++ [hackney: [pool: :default]]
case proxy do
nil -> options
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment