aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2020-03-03 17:27:56 +0300
committerAlexander Strizhakov <alex.strizhakov@gmail.com>2020-03-03 17:27:56 +0300
commit24bf5c4e89e6f97ed3d53157cead48c04015a51b (patch)
treeae482fbc3f6cb7825c2897ba5ff0a2ea2b4194ed
parentaaa879ce75a62e69a458226e65bef31b0f2ed08c (diff)
downloadpleroma-24bf5c4e89e6f97ed3d53157cead48c04015a51b.tar.gz
remove try block from pool request
-rw-r--r--lib/pleroma/http/http.ex22
1 files changed, 5 insertions, 17 deletions
diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex
index 4b774472e..cc0c39400 100644
--- a/lib/pleroma/http/http.ex
+++ b/lib/pleroma/http/http.ex
@@ -99,23 +99,11 @@ defmodule Pleroma.HTTP do
end
def request(%Client{} = client, request, %{pool: pool, timeout: timeout}) do
- try do
- :poolboy.transaction(
- pool,
- &Pleroma.Pool.Request.execute(&1, client, request, timeout),
- timeout
- )
- 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()}