diff options
author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-05 09:51:52 +0300 |
---|---|---|
committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-05 09:51:52 +0300 |
commit | eb324467d9c5c761a776ffc98347246c61ad02ae (patch) | |
tree | 4e774ca35a5a53e02c4646e1c8e0ef0502cedd5b | |
parent | b34bc669b91903a4567f6f527ebe16f9cd7e0ccf (diff) | |
download | pleroma-eb324467d9c5c761a776ffc98347246c61ad02ae.tar.gz pleroma-eb324467d9c5c761a776ffc98347246c61ad02ae.zip |
removing try block in getting gun info
-rw-r--r-- | lib/pleroma/pool/connections.ex | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/lib/pleroma/pool/connections.ex b/lib/pleroma/pool/connections.ex index f1fab2a24..f96c08f21 100644 --- a/lib/pleroma/pool/connections.ex +++ b/lib/pleroma/pool/connections.ex @@ -285,20 +285,15 @@ defmodule Pleroma.Pool.Connections do end defp compose_key_gun_info(pid) do - try do - # sometimes :gun.info can raise MatchError, which lead to pool terminate - %{origin_host: origin_host, origin_scheme: scheme, origin_port: port} = Gun.info(pid) - - host = - case :inet.ntoa(origin_host) do - {:error, :einval} -> origin_host - ip -> ip - end + %{origin_host: origin_host, origin_scheme: scheme, origin_port: port} = Gun.info(pid) - "#{scheme}:#{host}:#{port}" - rescue - _ -> :error_gun_info - end + host = + case :inet.ntoa(origin_host) do + {:error, :einval} -> origin_host + ip -> ip + end + + "#{scheme}:#{host}:#{port}" end defp find_conn(conns, conn_pid) do |