X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fuploaders%2Fs3.ex;h=481153fe897c00b60875657576a9f872ef75c35f;hb=a079ec3a3cdfd42d2cbd51c7698c2c87828e5778;hp=d85c8cb2fbf4e77f8452ebb0d3a36bb53ab89474;hpb=762be6ce10d2145e8e31d42c5d1a0bab93dbe7b0;p=akkoma

diff --git a/lib/pleroma/uploaders/s3.ex b/lib/pleroma/uploaders/s3.ex
index d85c8cb2f..481153fe8 100644
--- a/lib/pleroma/uploaders/s3.ex
+++ b/lib/pleroma/uploaders/s3.ex
@@ -30,23 +30,12 @@ defmodule Pleroma.Uploaders.S3 do
 
     op =
       if streaming do
-        op =
-          upload.tempfile
-          |> ExAws.S3.Upload.stream_file()
-          |> ExAws.S3.upload(bucket, s3_name, [
-            {:acl, :public_read},
-            {:content_type, upload.content_type}
-          ])
-
-        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
+        upload.tempfile
+        |> ExAws.S3.Upload.stream_file()
+        |> ExAws.S3.upload(bucket, s3_name, [
+          {:acl, :public_read},
+          {:content_type, upload.content_type}
+        ])
       else
         {:ok, file_data} = File.read(upload.tempfile)