hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

removing retry option and changing some logger messages levels

Browse source
This commit is contained in:
Alexander Strizhakov 2020-02-19 12:19:03 +03:00
commit c9db0507f8
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
3 changed files with 30 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/pleroma/pool/connections.ex
View file

@ -52,8 +52,7 @@ defmodule Pleroma.Pool.Connections do
opts =
opts
|> Enum.into(%{})
|> Map.put_new(:receive, false)
|> Map.put_new(:retry, pool_opts[:retry] || 5)
|> Map.put_new(:retry, pool_opts[:retry] || 0)
|> Map.put_new(:retry_timeout, pool_opts[:retry_timeout] || 100)
|> Map.put_new(:await_up_timeout, pool_opts[:await_up_timeout] || 5_000)
@ -108,11 +107,11 @@ defmodule Pleroma.Pool.Connections do
put_in(state.conns[key], %{conn | conn_state: conn_state, used_by: used_by})
else
false ->
Logger.warn("checkout for closed conn #{inspect(conn_pid)}")
Logger.debug("checkout for closed conn #{inspect(conn_pid)}")
state
nil ->
Logger.info("checkout for alive conn #{inspect(conn_pid)}, but is not in state")
Logger.debug("checkout for alive conn #{inspect(conn_pid)}, but is not in state")
state
end
@ -172,15 +171,15 @@ defmodule Pleroma.Pool.Connections do
})
else
:error_gun_info ->
Logger.warn(":gun.info caused error")
Logger.debug(":gun.info caused error")
state
false ->
Logger.warn(":gun_up message for closed conn #{inspect(conn_pid)}")
Logger.debug(":gun_up message for closed conn #{inspect(conn_pid)}")
state
nil ->
Logger.warn(
Logger.debug(
":gun_up message for alive conn #{inspect(conn_pid)}, but deleted from state"
)
@ -216,11 +215,11 @@ defmodule Pleroma.Pool.Connections do
else
false ->
# gun can send gun_down for closed conn, maybe connection is not closed yet
Logger.warn(":gun_down message for closed conn #{inspect(conn_pid)}")
Logger.debug(":gun_down message for closed conn #{inspect(conn_pid)}")
state
nil ->
Logger.warn(
Logger.debug(
":gun_down message for alive conn #{inspect(conn_pid)}, but deleted from state"
)