From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Tue, 3 Mar 2020 13:51:49 +0000 (+0300)
Subject: poolboy timeout fix
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=6ebf389d6e6ca5f3e56f9b017531f5f7e301ed3c;p=akkoma

poolboy timeout fix
---

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 ->