projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improvements and fixes for http requests
[akkoma]
/
lib
/
pleroma
/
http
/
adapter_helper
/
gun.ex
diff --git
a/lib/pleroma/http/adapter_helper/gun.ex
b/lib/pleroma/http/adapter_helper/gun.ex
index b4ff8306c3adeabd505b28fa6440c3e91c0fd984..db0a298b3bc9c3c172e0a986223a7ecd45316380 100644
(file)
--- a/
lib/pleroma/http/adapter_helper/gun.ex
+++ b/
lib/pleroma/http/adapter_helper/gun.ex
@@
-5,6
+5,7
@@
defmodule Pleroma.HTTP.AdapterHelper.Gun do
@behaviour Pleroma.HTTP.AdapterHelper
defmodule Pleroma.HTTP.AdapterHelper.Gun do
@behaviour Pleroma.HTTP.AdapterHelper
+ alias Pleroma.Config
alias Pleroma.Gun.ConnectionPool
alias Pleroma.HTTP.AdapterHelper
alias Pleroma.Gun.ConnectionPool
alias Pleroma.HTTP.AdapterHelper
@@
-14,7
+15,7
@@
defmodule Pleroma.HTTP.AdapterHelper.Gun do
connect_timeout: 5_000,
domain_lookup_timeout: 5_000,
tls_handshake_timeout: 5_000,
connect_timeout: 5_000,
domain_lookup_timeout: 5_000,
tls_handshake_timeout: 5_000,
- retry:
0
,
+ retry:
1
,
retry_timeout: 1000,
await_up_timeout: 5_000
]
retry_timeout: 1000,
await_up_timeout: 5_000
]
@@
-22,10
+23,11
@@
defmodule Pleroma.HTTP.AdapterHelper.Gun do
@spec options(keyword(), URI.t()) :: keyword()
def options(incoming_opts \\ [], %URI{} = uri) do
proxy =
@spec options(keyword(), URI.t()) :: keyword()
def options(incoming_opts \\ [], %URI{} = uri) do
proxy =
- Pleroma.Config.get([:http, :proxy_url])
+ [:http, :proxy_url]
+ |> Config.get()
|> AdapterHelper.format_proxy()
|> AdapterHelper.format_proxy()
- config_opts =
Pleroma.
Config.get([:http, :adapter], [])
+ config_opts = Config.get([:http, :adapter], [])
@defaults
|> Keyword.merge(config_opts)
@defaults
|> Keyword.merge(config_opts)
@@
-37,8
+39,7
@@
defmodule Pleroma.HTTP.AdapterHelper.Gun do
defp add_scheme_opts(opts, %{scheme: "http"}), do: opts
defp add_scheme_opts(opts, %{scheme: "https"}) do
defp add_scheme_opts(opts, %{scheme: "http"}), do: opts
defp add_scheme_opts(opts, %{scheme: "https"}) do
- opts
- |> Keyword.put(:certificates_verification, true)
+ Keyword.put(opts, :certificates_verification, true)
end
@spec get_conn(URI.t(), keyword()) :: {:ok, keyword()} | {:error, atom()}
end
@spec get_conn(URI.t(), keyword()) :: {:ok, keyword()} | {:error, atom()}
@@
-51,11
+52,11
@@
defmodule Pleroma.HTTP.AdapterHelper.Gun do
@prefix Pleroma.Gun.ConnectionPool
def limiter_setup do
@prefix Pleroma.Gun.ConnectionPool
def limiter_setup do
- wait =
Pleroma.
Config.get([:connections_pool, :connection_acquisition_wait])
- retries =
Pleroma.
Config.get([:connections_pool, :connection_acquisition_retries])
+ wait = Config.get([:connections_pool, :connection_acquisition_wait])
+ retries = Config.get([:connections_pool, :connection_acquisition_retries])
:pools
:pools
- |>
Pleroma.
Config.get([])
+ |> Config.get([])
|> Enum.each(fn {name, opts} ->
max_running = Keyword.get(opts, :size, 50)
max_waiting = Keyword.get(opts, :max_waiting, 10)
|> Enum.each(fn {name, opts} ->
max_running = Keyword.get(opts, :size, 50)
max_waiting = Keyword.get(opts, :max_waiting, 10)
@@
-69,7
+70,6
@@
defmodule Pleroma.HTTP.AdapterHelper.Gun do
case result do
:ok -> :ok
{:error, :existing} -> :ok
case result do
:ok -> :ok
{:error, :existing} -> :ok
- e -> raise e
end
end)
end
end)