projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Resolve merge conflicts
[akkoma]
/
lib
/
pleroma
/
http
/
connection.ex
diff --git
a/lib/pleroma/http/connection.ex
b/lib/pleroma/http/connection.ex
index b798eaa5ac63e54dc079b9ed20732f85d0a9600e..a1460d3038af6bae452259f50e2972e4925e51f4 100644
(file)
--- a/
lib/pleroma/http/connection.ex
+++ b/
lib/pleroma/http/connection.ex
@@
-8,8
+8,8
@@
defmodule Pleroma.HTTP.Connection do
"""
@hackney_options [
"""
@hackney_options [
-
timeout: 10
000,
- recv_timeout: 20000,
+
connect_timeout: 10_
000,
+ recv_timeout: 20
_
000,
follow_redirect: true,
pool: :federation
]
follow_redirect: true,
pool: :federation
]
@@
-29,8
+29,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