diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-07-12 23:52:26 +0300 |
|---|---|---|
| committer | Ariadne Conill <ariadne@dereferenced.org> | 2019-07-28 22:47:41 +0000 |
| commit | 2914f8a7498636e99c2feba389c89ef5fb67ca58 (patch) | |
| tree | ff8b5be4c493fb2d5504a1f4f49736abe3bf3210 | |
| parent | 8b1b3e84f4a606c71ea62771ea1ff7bd4971c290 (diff) | |
Merge the default options with custom ones in ReverseProxy and
Pleroma.HTTP
| -rw-r--r-- | lib/pleroma/http/connection.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/http/http.ex | 5 | ||||
| -rw-r--r-- | lib/pleroma/reverse_proxy.ex | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/lib/pleroma/http/connection.ex b/lib/pleroma/http/connection.ex index c216cdcb1..a1460d303 100644 --- a/lib/pleroma/http/connection.ex +++ b/lib/pleroma/http/connection.ex @@ -29,7 +29,7 @@ defmodule Pleroma.HTTP.Connection do # fetch Hackney options # - defp hackney_options(opts) do + def hackney_options(opts) do options = Keyword.get(opts, :adapter, []) adapter_options = Pleroma.Config.get([:http, :adapter], []) proxy_url = Pleroma.Config.get([:http, :proxy_url], nil) diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex index c96ee7353..dec24458a 100644 --- a/lib/pleroma/http/http.ex +++ b/lib/pleroma/http/http.ex @@ -65,10 +65,7 @@ defmodule Pleroma.HTTP do end def process_request_options(options) do - case Pleroma.Config.get([:http, :proxy_url]) do - nil -> options - proxy -> options ++ [proxy: proxy] - end + Keyword.merge(Pleroma.HTTP.Connection.hackney_options([]), options) end @doc """ diff --git a/lib/pleroma/reverse_proxy.ex b/lib/pleroma/reverse_proxy.ex index de0f6e1bc..7e537743b 100644 --- a/lib/pleroma/reverse_proxy.ex +++ b/lib/pleroma/reverse_proxy.ex @@ -61,7 +61,7 @@ defmodule Pleroma.ReverseProxy do * `http`: options for [hackney](https://github.com/benoitc/hackney). """ - @default_hackney_options [] + @default_hackney_options [pool: :media] @inline_content_types [ "image/gif", @@ -94,7 +94,8 @@ defmodule Pleroma.ReverseProxy do def call(conn = %{method: method}, url, opts) when method in @methods do hackney_opts = - @default_hackney_options + Pleroma.HTTP.Connection.hackney_options([]) + |> Keyword.merge(@default_hackney_options) |> Keyword.merge(Keyword.get(opts, :http, [])) |> HTTP.process_request_options() |