projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Documentation: Add warning about database mix tasks.
[akkoma]
/
lib
/
pleroma
/
http
/
connection.ex
diff --git
a/lib/pleroma/http/connection.ex
b/lib/pleroma/http/connection.ex
index db46f9e5540f6bd9e9e3c66d35ef0e292d95c18e..7e2c6f5e8207e7b9b413d408b8e4f892f0fc83cb 100644
(file)
--- a/
lib/pleroma/http/connection.ex
+++ b/
lib/pleroma/http/connection.ex
@@
-1,13
+1,18
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.HTTP.Connection do
@moduledoc """
Connection for http-requests.
"""
@hackney_options [
defmodule Pleroma.HTTP.Connection do
@moduledoc """
Connection for http-requests.
"""
@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)
]
@adapter Application.get_env(:tesla, :adapter)
@@
-25,8
+30,14
@@
defmodule Pleroma.HTTP.Connection do
# fetch Hackney options
#
# fetch Hackney options
#
- def
p hackney_options(opts \\ []
) do
+ def
hackney_options(opts
) do
options = Keyword.get(opts, :adapter, [])
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
end
end