aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2020-03-03 16:51:49 +0300
committerAlexander Strizhakov <alex.strizhakov@gmail.com>2020-03-03 16:51:49 +0300
commit6ebf389d6e6ca5f3e56f9b017531f5f7e301ed3c (patch)
treee0c6e0706461fcaf840759215f3ce544d9553cd1 /lib
parent7c0ed9302cb13ab44c1bf18017538315dcd0ce2e (diff)
downloadpleroma-6ebf389d6e6ca5f3e56f9b017531f5f7e301ed3c.tar.gz
poolboy timeout fix
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/http/http.ex4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex
index f7b0095d7..4b774472e 100644
--- a/lib/pleroma/http/http.ex
+++ b/lib/pleroma/http/http.ex
@@ -102,8 +102,8 @@ defmodule Pleroma.HTTP do
try do
:poolboy.transaction(
pool,
- &Pleroma.Pool.Request.execute(&1, client, request, timeout + 500),
- timeout + 1_000
+ &Pleroma.Pool.Request.execute(&1, client, request, timeout),
+ timeout
)
rescue
e ->