Merge branch 'develop' into gun

[akkoma] / lib / pleroma / pool / request.ex

diff --git a/lib/pleroma/pool/request.ex b/lib/pleroma/pool/request.ex
index 2c35745614baea1d226314620836f217b7b74a49..db7c10c01f7c51d91e9cc9a3cee38f5b63588fe1 100644 (file)
--- a/lib/pleroma/pool/request.ex
+++ b/lib/pleroma/pool/request.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Pool.Request do
@@ -22,18 +22,13 @@ defmodule Pleroma.Pool.Request do
 
   @impl true
   def handle_call({:execute, client, request}, _from, state) do
-    response = Pleroma.HTTP.request_try(client, request)
+    response = Pleroma.HTTP.request(client, request)
 
     {:reply, response, state}
   end
 
   @impl true
-  def handle_info({:gun_data, _conn, stream, _, _}, state) do
-    # in some cases if we reuse conn and got {:error, :body_too_large}
-    # gun continues to send messages to this process,
-    # so we flush messages for this request
-    :ok = :gun.flush(stream)
-
+  def handle_info({:gun_data, _conn, _stream, _, _}, state) do
     {:noreply, state}
   end
 
@@ -49,8 +44,7 @@ defmodule Pleroma.Pool.Request do
   end
 
   @impl true
-  def handle_info({:gun_error, _conn, stream, _error}, state) do
-    :ok = :gun.flush(stream)
+  def handle_info({:gun_error, _conn, _stream, _error}, state) do
     {:noreply, state}
   end