commit: ae7c79cfc236f7192ea8425560cc31a60e689e9d
parent: 2d957b985fcf97fd38f17253a658685841447c1d
Author: kaniini <nenolod@gmail.com>
Date: Fri, 26 Oct 2018 03:14:57 +0000
Merge branch 'bugfix/fd-exhaustion' into 'develop'
http: enable keepalive / connection pooling (closes #336)
Closes #336
See merge request pleroma/pleroma!393
Diffstat:
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex
@@ -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