diff options
| author | kaniini <nenolod@gmail.com> | 2018-10-26 03:14:57 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-10-26 03:14:57 +0000 |
| commit | ae7c79cfc236f7192ea8425560cc31a60e689e9d (patch) | |
| tree | 294a2c765bcbdd3847326fe04dc440cb274dac0c /lib | |
| parent | 2d957b985fcf97fd38f17253a658685841447c1d (diff) | |
| parent | 7338368ad901db1463014f29fbecd89794fdc908 (diff) | |
| download | pleroma-ae7c79cfc236f7192ea8425560cc31a60e689e9d.tar.gz | |
Merge branch 'bugfix/fd-exhaustion' into 'develop'
http: enable keepalive / connection pooling (closes #336)
Closes #336
See merge request pleroma/pleroma!393
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/http/http.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex index c19bccf60..f222e1774 100644 --- 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 |