pleroma

commit: 047a60c46e11b68abfe710a895f4a9c134b951e8
parent: b42869424f43af82d40b9095092556647f852a22
Author: rinpatch <rinpatch@sdf.org>
Date:   Sat,  5 Sep 2020 19:04:19 +0000

Merge branch 'hotfix-the-hotfix' into 'develop'

ConnectionPool: fix the previous hotfix

See merge request pleroma/pleroma!2959
Diffstat:
M
lib/pleroma/tesla/middleware/connection_pool.ex
6
+++++-

1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/pleroma/tesla/middleware/connection_pool.ex b/lib/pleroma/tesla/middleware/connection_pool.ex
@@ -32,7 +32,8 @@ defmodule Pleroma.Tesla.Middleware.ConnectionPool do
           {:ok, env} ->
             unless opts[:adapter][:body_as] == :chunks do
               ConnectionPool.release_conn(conn_pid)
-              {:ok, pop_in(env.opts[:adapter][:conn])}
+              {_, res} = pop_in(env.opts[:adapter][:conn])
+              {:ok, res}
             else
               {:ok, env}
             end
@@ -41,6 +42,9 @@ defmodule Pleroma.Tesla.Middleware.ConnectionPool do
             ConnectionPool.release_conn(conn_pid)
             err
         end
+
+      err ->
+        err
     end
   end
 end