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 e2e92857f21fc5ea6be32e9a9e668a919ad98a39..c0173465ab741d9bf39b41750865cdbe7f30c3e7 100644
(file)
--- a/
lib/pleroma/http/connection.ex
+++ b/
lib/pleroma/http/connection.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-201
8
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-201
9
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.HTTP.Connection do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.HTTP.Connection do
@@
-8,9
+8,10
@@
defmodule Pleroma.HTTP.Connection do
"""
@hackney_options [
"""
@hackney_options [
- timeout: 10000,
- recv_timeout: 20000,
- follow_redirect: true
+ connect_timeout: 2_000,
+ recv_timeout: 20_000,
+ follow_redirect: true,
+ pool: :federation
]
@adapter Application.get_env(:tesla, :adapter)
]
@adapter Application.get_env(:tesla, :adapter)
@@
-30,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, [])
- @hackney_options ++ options
+ adapter_options = Pleroma.Config.get([:http, :adapter], [])
+
+ @hackney_options
+ |> Keyword.merge(adapter_options)
+ |> Keyword.merge(options)
end
end
end
end