X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fpool%2Fconnections.ex;h=4d4ba913c72fe4d9a2f1ca67de2f943716317e54;hb=7f692343c80ddf353712490edfbcdb14866f5685;hp=a444f822ff97ab0f8357271e5d70309302fc87bc;hpb=8efae966b1e87fe448a13d04eae0898c4a102c29;p=akkoma
diff --git a/lib/pleroma/pool/connections.ex b/lib/pleroma/pool/connections.ex
index a444f822f..4d4ba913c 100644
--- a/lib/pleroma/pool/connections.ex
+++ b/lib/pleroma/pool/connections.ex
@@ -1,11 +1,12 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors
+# Copyright © 2017-2020 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Pool.Connections do
use GenServer
alias Pleroma.Config
+ alias Pleroma.Gun
require Logger
@@ -19,8 +20,6 @@ defmodule Pleroma.Pool.Connections do
defstruct conns: %{}, opts: []
- alias Pleroma.Gun.API
-
@spec start_link({atom(), keyword()}) :: {:ok, pid()}
def start_link({name, opts}) do
GenServer.start_link(__MODULE__, opts, name: name)
@@ -34,19 +33,18 @@ defmodule Pleroma.Pool.Connections do
def checkin(url, name) when is_binary(url), do: checkin(URI.parse(url), name)
def checkin(%URI{} = uri, name) do
- timeout = Config.get([:connections_pool, :receive_connection_timeout], 250)
+ timeout = Config.get([:connections_pool, :checkin_timeout], 250)
- GenServer.call(
- name,
- {:checkin, uri},
- timeout
- )
+ GenServer.call(name, {:checkin, uri}, timeout)
end
@spec alive?(atom()) :: boolean()
def alive?(name) do
- pid = Process.whereis(name)
- if pid, do: Process.alive?(pid), else: false
+ if pid = Process.whereis(name) do
+ Process.alive?(pid)
+ else
+ false
+ end
end
@spec get_state(atom()) :: t()
@@ -89,18 +87,11 @@ defmodule Pleroma.Pool.Connections do
@impl true
def handle_cast({:checkout, conn_pid, pid}, state) do
- Logger.debug("checkout #{inspect(conn_pid)}")
-
state =
with true <- Process.alive?(conn_pid),
{key, conn} <- find_conn(state.conns, conn_pid),
used_by <- List.keydelete(conn.used_by, pid, 0) do
- conn_state =
- if used_by == [] do
- :idle
- else
- conn.conn_state
- end
+ conn_state = if used_by == [], do: :idle, else: conn.conn_state
put_in(state.conns[key], %{conn | conn_state: conn_state, used_by: used_by})
else
@@ -125,27 +116,25 @@ defmodule Pleroma.Pool.Connections do
@impl true
def handle_call({:checkin, uri}, from, state) do
key = "#{uri.scheme}:#{uri.host}:#{uri.port}"
- Logger.debug("checkin #{key}")
case state.conns[key] do
- %{conn: conn, gun_state: gun_state} = current_conn when gun_state == :up ->
- Logger.debug("reusing conn #{key}")
-
- with time <- :os.system_time(:second),
- last_reference <- time - current_conn.last_reference,
- current_crf <- crf(last_reference, 100, current_conn.crf),
- state <-
- put_in(state.conns[key], %{
- current_conn
- | last_reference: time,
- crf: current_crf,
- conn_state: :active,
- used_by: [from | current_conn.used_by]
- }) do
- {:reply, conn, state}
- end
+ %{conn: pid, gun_state: :up} = conn ->
+ time = :os.system_time(:second)
+ last_reference = time - conn.last_reference
+ crf = crf(last_reference, 100, conn.crf)
+
+ state =
+ put_in(state.conns[key], %{
+ conn
+ | last_reference: time,
+ crf: crf,
+ conn_state: :active,
+ used_by: [from | conn.used_by]
+ })
- %{gun_state: gun_state} when gun_state == :down ->
+ {:reply, pid, state}
+
+ %{gun_state: :down} ->
{:reply, nil, state}
nil ->
@@ -165,50 +154,49 @@ defmodule Pleroma.Pool.Connections do
def handle_call(:unused_conns, _from, state) do
unused_conns =
state.conns
- |> Enum.filter(fn {_k, v} ->
- v.conn_state == :idle and v.used_by == []
- end)
- |> Enum.sort(fn {_x_k, x}, {_y_k, y} ->
- x.crf <= y.crf and x.last_reference <= y.last_reference
- end)
+ |> Enum.filter(&filter_conns/1)
+ |> Enum.sort(&sort_conns/2)
{:reply, unused_conns, state}
end
+ defp filter_conns({_, %{conn_state: :idle, used_by: []}}), do: true
+ defp filter_conns(_), do: false
+
+ defp sort_conns({_, c1}, {_, c2}) do
+ c1.crf <= c2.crf and c1.last_reference <= c2.last_reference
+ end
+
@impl true
def handle_info({:gun_up, conn_pid, _protocol}, state) do
+ %{origin_host: host, origin_scheme: scheme, origin_port: port} = Gun.info(conn_pid)
+
+ host =
+ case :inet.ntoa(host) do
+ {:error, :einval} -> host
+ ip -> ip
+ end
+
+ key = "#{scheme}:#{host}:#{port}"
+
state =
- with conn_key when is_binary(conn_key) <- compose_key_gun_info(conn_pid),
- {key, conn} <- find_conn(state.conns, conn_pid, conn_key),
- {true, key} <- {Process.alive?(conn_pid), key},
- time <- :os.system_time(:second),
- last_reference <- time - conn.last_reference,
- current_crf <- crf(last_reference, 100, conn.crf) do
+ with {key, conn} <- find_conn(state.conns, conn_pid, key),
+ {true, key} <- {Process.alive?(conn_pid), key} do
put_in(state.conns[key], %{
conn
| gun_state: :up,
- last_reference: time,
- crf: current_crf,
conn_state: :active,
retries: 0
})
else
- :error_gun_info ->
- Logger.debug(":gun.info caused error")
- state
-
{false, key} ->
- Logger.debug(":gun_up message for closed conn #{inspect(conn_pid)}")
-
put_in(
state.conns,
Map.delete(state.conns, key)
)
nil ->
- Logger.debug(":gun_up message for conn which is not found in state")
-
- :ok = API.close(conn_pid)
+ :ok = Gun.close(conn_pid)
state
end
@@ -218,14 +206,13 @@ defmodule Pleroma.Pool.Connections do
@impl true
def handle_info({:gun_down, conn_pid, _protocol, _reason, _killed}, state) do
- retries = Config.get([:connections_pool, :retry], 0)
+ retries = Config.get([:connections_pool, :retry], 1)
# we can't get info on this pid, because pid is dead
state =
with {key, conn} <- find_conn(state.conns, conn_pid),
{true, key} <- {Process.alive?(conn_pid), key} do
if conn.retries == retries do
- Logger.debug("closing conn if retries is eq #{inspect(conn_pid)}")
- :ok = API.close(conn.conn)
+ :ok = Gun.close(conn.conn)
put_in(
state.conns,
@@ -240,18 +227,13 @@ defmodule Pleroma.Pool.Connections do
end
else
{false, key} ->
- # gun can send gun_down for closed conn, maybe connection is not closed yet
- Logger.debug(":gun_down message for closed conn #{inspect(conn_pid)}")
-
put_in(
state.conns,
Map.delete(state.conns, key)
)
nil ->
- Logger.debug(":gun_down message for conn which is not found in state")
-
- :ok = API.close(conn_pid)
+ Logger.debug(":gun_down for conn which isn't found in state")
state
end
@@ -275,7 +257,7 @@ defmodule Pleroma.Pool.Connections do
)
else
nil ->
- Logger.debug(":DOWN message for conn which is not found in state")
+ Logger.debug(":DOWN for conn which isn't found in state")
state
end
@@ -283,23 +265,6 @@ defmodule Pleroma.Pool.Connections do
{:noreply, state}
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} = API.info(pid)
-
- host =
- case :inet.ntoa(origin_host) do
- {:error, :einval} -> origin_host
- ip -> ip
- end
-
- "#{scheme}:#{host}:#{port}"
- rescue
- _ -> :error_gun_info
- end
- end
-
defp find_conn(conns, conn_pid) do
Enum.find(conns, fn {_key, conn} ->
conn.conn == conn_pid
@@ -315,8 +280,4 @@ defmodule Pleroma.Pool.Connections do
def crf(current, steps, crf) do
1 + :math.pow(0.5, current / steps) * crf
end
-
- def compose_uri_log(%URI{scheme: scheme, host: host, path: path}) do
- "#{scheme}://#{host}#{path}"
- end
end