hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

timeout option moved to gun adapter helper

Browse source
This commit is contained in:
Alexander Strizhakov 2020-09-02 10:50:51 +03:00
commit 84fbf16161
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
3 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/pleroma/uploaders/s3.ex
View file

@ -54,11 +54,15 @@ defmodule Pleroma.Uploaders.S3 do
{:content_type, upload.content_type}
])
# set s3 upload timeout to respect :upload pool timeout
# timeout should be slightly larger, so s3 can retry upload on fail
timeout = Pleroma.HTTP.AdapterHelper.pool_timeout(:upload) + 1_000
opts = Keyword.put(op.opts, :timeout, timeout)
Map.put(op, :opts, opts)
if Application.get_env(:tesla, :adapter) == Tesla.Adapter.Gun do
# set s3 upload timeout to respect :upload pool timeout
# timeout should be slightly larger, so s3 can retry upload on fail
timeout = Pleroma.HTTP.AdapterHelper.Gun.pool_timeout(:upload) + 1_000
opts = Keyword.put(op.opts, :timeout, timeout)
Map.put(op, :opts, opts)
else
op
end
else
{:ok, file_data} = File.read(upload.tempfile)