X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fhttp%2Fhttp.ex;h=c5f720bc9f756292f0c99d2c44500911ca19062f;hb=8ddbedcd9aa4ac795c64c7b9540e5c83185da414;hp=32d9cf5aa7806efdcc50b08f40cb164bb6f17e18;hpb=3dc5f04976293fbcedfc01281f89c4f54c995d59;p=akkoma
diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex
index 32d9cf5aa..c5f720bc9 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-2018 Pleroma Authors
+# Copyright © 2017-2019 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.HTTP do
@@ -27,18 +27,29 @@ defmodule Pleroma.HTTP do
"""
def request(method, url, body \\ "", headers \\ [], options \\ []) do
- options =
- process_request_options(options)
- |> process_sni_options(url)
-
- %{}
- |> Builder.method(method)
- |> Builder.headers(headers)
- |> Builder.opts(options)
- |> Builder.url(url)
- |> Builder.add_param(:body, :body, body)
- |> Enum.into([])
- |> (&Tesla.request(Connection.new(), &1)).()
+ try do
+ options =
+ process_request_options(options)
+ |> process_sni_options(url)
+
+ params = Keyword.get(options, :params, [])
+
+ %{}
+ |> Builder.method(method)
+ |> Builder.headers(headers)
+ |> Builder.opts(options)
+ |> Builder.url(url)
+ |> Builder.add_param(:body, :body, body)
+ |> Builder.add_param(:query, :query, params)
+ |> Enum.into([])
+ |> (&Tesla.request(Connection.new(options), &1)).()
+ rescue
+ e ->
+ {:error, e}
+ catch
+ :exit, e ->
+ {:error, e}
+ end
end
defp process_sni_options(options, nil), do: options
@@ -56,7 +67,6 @@ defmodule Pleroma.HTTP do
def process_request_options(options) do
config = Application.get_env(:pleroma, :http, [])
proxy = Keyword.get(config, :proxy_url, nil)
- options = options ++ [adapter: [pool: :default]]
case proxy do
nil -> options