X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fhttp%2Fconnection.ex;h=7e2c6f5e8207e7b9b413d408b8e4f892f0fc83cb;hb=b791a0865641eb8210380e22e04a9fb680a79dcb;hp=35c1490da22813356d6ffc5a7086a79de9f04f24;hpb=89fbed88212657e3dcd4bbcb2c0718b07802037f;p=akkoma
diff --git a/lib/pleroma/http/connection.ex b/lib/pleroma/http/connection.ex
index 35c1490da..7e2c6f5e8 100644
--- a/lib/pleroma/http/connection.ex
+++ b/lib/pleroma/http/connection.ex
@@ -1,5 +1,5 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2018 Pleroma Authors
+# Copyright © 2017-2019 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.HTTP.Connection do
@@ -8,10 +8,11 @@ defmodule Pleroma.HTTP.Connection do
"""
@hackney_options [
- pool: :default,
- timeout: 10000,
- recv_timeout: 20000,
- follow_redirect: true
+ connect_timeout: 10_000,
+ recv_timeout: 20_000,
+ follow_redirect: true,
+ force_redirect: true,
+ pool: :federation
]
@adapter Application.get_env(:tesla, :adapter)
@@ -29,8 +30,14 @@ defmodule Pleroma.HTTP.Connection do
# fetch Hackney options
#
- defp hackney_options(opts) do
+ def hackney_options(opts) do
options = Keyword.get(opts, :adapter, [])
- @hackney_options ++ options
+ adapter_options = Pleroma.Config.get([:http, :adapter], [])
+ proxy_url = Pleroma.Config.get([:http, :proxy_url], nil)
+
+ @hackney_options
+ |> Keyword.merge(adapter_options)
+ |> Keyword.merge(options)
+ |> Keyword.merge(proxy: proxy_url)
end
end