X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fhttp%2Fhttp.ex;h=583b564842fe79477f0205ef758ab2b5c094351f;hb=2c4844237f294d27f58737f9694f77b1cfcb10e7;hp=cc0c394007354555f76e63419f7e98fb246ff430;hpb=24bf5c4e89e6f97ed3d53157cead48c04015a51b;p=akkoma
diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex
index cc0c39400..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
@@ -56,10 +56,9 @@ defmodule Pleroma.HTTP do
{:ok, Env.t()} | {:error, any()}
def request(method, url, body, headers, options) when is_binary(url) do
uri = URI.parse(url)
- received_adapter_opts = Keyword.get(options, :adapter, [])
- adapter_opts = Connection.options(uri, received_adapter_opts)
+ adapter_opts = Connection.options(uri, options[:adapter] || [])
options = put_in(options[:adapter], adapter_opts)
- params = Keyword.get(options, :params, [])
+ params = options[:params] || []
request = build_request(method, headers, options, url, body, params)
adapter = Application.get_env(:tesla, :adapter)
@@ -88,15 +87,11 @@ defmodule Pleroma.HTTP do
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
:poolboy.transaction(
@@ -106,18 +101,8 @@ defmodule Pleroma.HTTP do
)
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()