moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Closes #336

See merge request pleroma/pleroma!393
This commit is contained in:
kaniini 2018-10-26 03:14:57 +00:00
parent 2d957b985f 7338368ad9
commit ae7c79cfc2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,9 +19,10 @@ defp process_sni_options(options, url) do
end end
end end
def process_request_options(options) do defp 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 ++ [hackney: [pool: :default]]
case proxy do case proxy do
nil -> options nil -> options