projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
b428694
)
Merge branch 'hotfix-the-hotfix' into 'develop'
author
rinpatch
<rinpatch@sdf.org>
Sat, 5 Sep 2020 19:04:19 +0000
(19:04 +0000)
committer
rinpatch
<rinpatch@sdf.org>
Sat, 5 Sep 2020 19:04:19 +0000
(19:04 +0000)
ConnectionPool: fix the previous hotfix
See merge request pleroma/pleroma!2959
lib/pleroma/tesla/middleware/connection_pool.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/tesla/middleware/connection_pool.ex
b/lib/pleroma/tesla/middleware/connection_pool.ex
index 049db6eb384f0aaca8c530986fb4ff6a3f5c001f..056e736ce8fd82d281ac417d9d22a9ea07056f4e 100644
(file)
--- 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