Browse Source

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

ConnectionPool: fix the previous hotfix

See merge request pleroma/pleroma!2959
fix/disable-favicons-in-tests
rinpatch 3 years ago
parent
commit
047a60c46e
1 changed files with 5 additions and 1 deletions
  1. +5
    -1
      lib/pleroma/tesla/middleware/connection_pool.ex

+ 5
- 1
lib/pleroma/tesla/middleware/connection_pool.ex View File

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

Loading…
Cancel
Save