diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-08-19 10:22:59 +0300 |
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-09-02 09:04:23 +0300 |
| commit | c17d83cd7330d5c874f647a5224a3a130ed88fb0 (patch) | |
| tree | 663ed868abe80dfa1567e3070fbffca14dcadd7d /lib/pleroma/uploaders | |
| parent | d48755791ddfea0b30bc5a843dfc4181efd63982 (diff) | |
| download | pleroma-c17d83cd7330d5c874f647a5224a3a130ed88fb0.tar.gz | |
improvements and fixes for http requests
- fix for gun worker termination in some circumstances
- pool for http clients (ex_aws, tzdata)
- default pool timeouts for gun
- gun retries on gun_down messages
- s3 upload timeout if streaming enabled
Diffstat (limited to 'lib/pleroma/uploaders')
| -rw-r--r-- | lib/pleroma/uploaders/s3.ex | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/lib/pleroma/uploaders/s3.ex b/lib/pleroma/uploaders/s3.ex index a13ff23b6..ed9794ca2 100644 --- a/lib/pleroma/uploaders/s3.ex +++ b/lib/pleroma/uploaders/s3.ex @@ -46,12 +46,19 @@ defmodule Pleroma.Uploaders.S3 do op = if streaming do - upload.tempfile - |> ExAws.S3.Upload.stream_file() - |> ExAws.S3.upload(bucket, s3_name, [ - {:acl, :public_read}, - {:content_type, upload.content_type} - ]) + op = + upload.tempfile + |> ExAws.S3.Upload.stream_file() + |> ExAws.S3.upload(bucket, s3_name, [ + {:acl, :public_read}, + {: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) else {:ok, file_data} = File.read(upload.tempfile) |