|
|
@@ -5,6 +5,8 @@ |
|
|
|
defmodule Pleroma.ReverseProxy.Client.Tesla do |
|
|
|
@behaviour Pleroma.ReverseProxy.Client |
|
|
|
|
|
|
|
alias Pleroma.Gun.ConnectionPool |
|
|
|
|
|
|
|
@type headers() :: [{String.t(), String.t()}] |
|
|
|
@type status() :: pos_integer() |
|
|
|
|
|
|
@@ -31,6 +33,8 @@ defmodule Pleroma.ReverseProxy.Client.Tesla do |
|
|
|
if is_map(response.body) and method != :head do |
|
|
|
{:ok, response.status, response.headers, response.body} |
|
|
|
else |
|
|
|
conn_pid = response.opts[:adapter][:conn] |
|
|
|
ConnectionPool.release_conn(conn_pid) |
|
|
|
{:ok, response.status, response.headers} |
|
|
|
end |
|
|
|
else |
|
|
@@ -41,15 +45,8 @@ defmodule Pleroma.ReverseProxy.Client.Tesla do |
|
|
|
@impl true |
|
|
|
@spec stream_body(map()) :: |
|
|
|
{:ok, binary(), map()} | {:error, atom() | String.t()} | :done | no_return() |
|
|
|
def stream_body(%{pid: pid, opts: opts, fin: true}) do |
|
|
|
# if connection was reused, but in tesla were redirects, |
|
|
|
# tesla returns new opened connection, which must be closed manually |
|
|
|
if opts[:old_conn], do: Tesla.Adapter.Gun.close(pid) |
|
|
|
# if there were redirects we need to checkout old conn |
|
|
|
conn = opts[:old_conn] || opts[:conn] |
|
|
|
|
|
|
|
if conn, do: :ok = Pleroma.Gun.ConnectionPool.release_conn(conn) |
|
|
|
|
|
|
|
def stream_body(%{pid: pid, fin: true}) do |
|
|
|
ConnectionPool.release_conn(pid) |
|
|
|
:done |
|
|
|
end |
|
|
|
|
|
|
@@ -74,8 +71,7 @@ defmodule Pleroma.ReverseProxy.Client.Tesla do |
|
|
|
@impl true |
|
|
|
@spec close(map) :: :ok | no_return() |
|
|
|
def close(%{pid: pid}) do |
|
|
|
adapter = check_adapter() |
|
|
|
adapter.close(pid) |
|
|
|
ConnectionPool.release_conn(pid) |
|
|
|
end |
|
|
|
|
|
|
|
defp check_adapter do |
|
|
|