projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'harmonize_return_types_in_user_module' into 'develop'
[akkoma]
/
lib
/
pleroma
/
http
/
connection.ex
diff --git
a/lib/pleroma/http/connection.ex
b/lib/pleroma/http/connection.ex
index 926f892bab4f8b1a2e176943203a5a972613aeb9..c0173465ab741d9bf39b41750865cdbe7f30c3e7 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 [
- connect_timeout:
1
_000,
- recv_timeout:
1
0_000,
+ connect_timeout:
2
_000,
+ recv_timeout:
2
0_000,
follow_redirect: true,
pool: :federation
]
follow_redirect: true,
pool: :federation
]
@@
-31,6
+31,10
@@
defmodule Pleroma.HTTP.Connection do
#
defp hackney_options(opts) do
options = Keyword.get(opts, :adapter, [])
#
defp hackney_options(opts) do
options = Keyword.get(opts, :adapter, [])
- Keyword.merge(@hackney_options, options)
+ adapter_options = Pleroma.Config.get([:http, :adapter], [])
+
+ @hackney_options
+ |> Keyword.merge(adapter_options)
+ |> Keyword.merge(options)
end
end
end
end