projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release/2.1.0' into 'stable'
[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 883f7f6f73457bc360d3f02aada0031d6079b8d7..b4ff8306c3adeabd505b28fa6440c3e91c0fd984 100644
(file)
--- a/
lib/pleroma/http/adapter_helper/gun.ex
+++ b/
lib/pleroma/http/adapter_helper/gun.ex
@@
-14,7
+14,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:
1
,
+ retry:
0
,
retry_timeout: 1000,
await_up_timeout: 5_000
]
retry_timeout: 1000,
await_up_timeout: 5_000
]
@@
-39,7
+39,6
@@
defmodule Pleroma.HTTP.AdapterHelper.Gun do
defp add_scheme_opts(opts, %{scheme: "https"}) do
opts
|> Keyword.put(:certificates_verification, true)
defp add_scheme_opts(opts, %{scheme: "https"}) do
opts
|> Keyword.put(:certificates_verification, true)
- |> Keyword.put(:tls_opts, log_level: :warning)
end
@spec get_conn(URI.t(), keyword()) :: {:ok, keyword()} | {:error, atom()}
end
@spec get_conn(URI.t(), keyword()) :: {:ok, keyword()} | {:error, atom()}
@@
-61,11
+60,17
@@
defmodule Pleroma.HTTP.AdapterHelper.Gun do
max_running = Keyword.get(opts, :size, 50)
max_waiting = Keyword.get(opts, :max_waiting, 10)
max_running = Keyword.get(opts, :size, 50)
max_waiting = Keyword.get(opts, :max_waiting, 10)
-
:ok
=
+
result
=
ConcurrentLimiter.new(:"#{@prefix}.#{name}", max_running, max_waiting,
wait: wait,
max_retries: retries
)
ConcurrentLimiter.new(:"#{@prefix}.#{name}", max_running, max_waiting,
wait: wait,
max_retries: retries
)
+
+ case result do
+ :ok -> :ok
+ {:error, :existing} -> :ok
+ e -> raise e
+ end
end)
:ok
end)
:ok