X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fhttp%2Fhttp.ex;h=583b564842fe79477f0205ef758ab2b5c094351f;hb=908cf22a6cb07044eb0fb44c9673c8adcf22c0db;hp=ad47dc936f56ca60ed22705fefa2e06d79df3916;hpb=cf943492878c901cf2f0056ee2a8814e0322e9d8;p=akkoma
diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex
index ad47dc936..583b56484 100644
--- a/lib/pleroma/http/http.ex
+++ b/lib/pleroma/http/http.ex
@@ -1,5 +1,5 @@
# 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.HTTP do
@@ -55,83 +55,54 @@ defmodule Pleroma.HTTP do
@spec request(atom(), Request.url(), String.t(), Request.headers(), keyword()) ::
{:ok, Env.t()} | {:error, any()}
def request(method, url, body, headers, options) when is_binary(url) do
- with uri <- URI.parse(url),
- received_adapter_opts <- Keyword.get(options, :adapter, []),
- adapter_opts <- Connection.options(uri, received_adapter_opts),
- options <- put_in(options[:adapter], adapter_opts),
- params <- Keyword.get(options, :params, []),
- request <- build_request(method, headers, options, url, body, params),
- client <- Tesla.client([Tesla.Middleware.FollowRedirects], tesla_adapter()),
- pid <- Process.whereis(adapter_opts[:pool]) do
- pool_alive? =
- if tesla_adapter() == Tesla.Adapter.Gun do
- if pid, do: Process.alive?(pid), else: false
- else
- false
- end
-
- request_opts =
- adapter_opts
- |> Enum.into(%{})
- |> Map.put(:env, Pleroma.Config.get([:env]))
- |> Map.put(:pool_alive?, pool_alive?)
-
- response =
- request(
- client,
- request,
- request_opts
- )
-
- Connection.after_request(adapter_opts)
-
- response
- end
+ uri = URI.parse(url)
+ adapter_opts = Connection.options(uri, options[:adapter] || [])
+ options = put_in(options[:adapter], adapter_opts)
+ params = options[:params] || []
+ request = build_request(method, headers, options, url, body, params)
+
+ adapter = Application.get_env(:tesla, :adapter)
+ client = Tesla.client([Tesla.Middleware.FollowRedirects], adapter)
+
+ pid = Process.whereis(adapter_opts[:pool])
+
+ pool_alive? =
+ if adapter == Tesla.Adapter.Gun && pid do
+ Process.alive?(pid)
+ else
+ false
+ end
+
+ request_opts =
+ adapter_opts
+ |> Enum.into(%{})
+ |> Map.put(:env, Pleroma.Config.get([:env]))
+ |> Map.put(:pool_alive?, pool_alive?)
+
+ response = request(client, request, request_opts)
+
+ Connection.after_request(adapter_opts)
+
+ response
end
@spec request(Client.t(), keyword(), map()) :: {:ok, Env.t()} | {:error, any()}
- def request(%Client{} = client, request, %{env: :test}), do: request_try(client, request)
+ def request(%Client{} = client, request, %{env: :test}), do: request(client, request)
- def request(%Client{} = client, request, %{body_as: :chunks}) do
- request_try(client, request)
- end
+ def request(%Client{} = client, request, %{body_as: :chunks}), do: request(client, request)
- def request(%Client{} = client, request, %{pool_alive?: false}) do
- request_try(client, request)
- end
+ def request(%Client{} = client, request, %{pool_alive?: false}), do: request(client, request)
def request(%Client{} = client, request, %{pool: pool, timeout: timeout}) do
- try do
- :poolboy.transaction(
- pool,
- &Pleroma.Pool.Request.execute(&1, client, request, timeout + 500),
- timeout + 1_000
- )
- rescue
- e ->
- {:error, e}
- catch
- :exit, {:timeout, _} ->
- Logger.warn("Receive response from pool failed #{request[:url]}")
- {:error, :recv_pool_timeout}
-
- :exit, e ->
- {:error, e}
- end
+ :poolboy.transaction(
+ pool,
+ &Pleroma.Pool.Request.execute(&1, client, request, timeout),
+ timeout
+ )
end
- @spec request_try(Client.t(), keyword()) :: {:ok, Env.t()} | {:error, any()}
- def request_try(client, request) do
- try do
- Tesla.request(client, request)
- rescue
- e ->
- {:error, e}
- catch
- :exit, e ->
- {:error, e}
- end
- end
+ @spec request(Client.t(), keyword()) :: {:ok, Env.t()} | {:error, any()}
+ def request(client, request), do: Tesla.request(client, request)
defp build_request(method, headers, options, url, body, params) do
Builder.new()
@@ -143,6 +114,4 @@ defmodule Pleroma.HTTP do
|> Builder.add_param(:query, :query, params)
|> Builder.convert_to_keyword()
end
-
- defp tesla_adapter, do: Application.get_env(:tesla, :adapter)
end