From: tateisu <tateisu@gmail.com>
Date: Tue, 6 Oct 2020 19:29:22 +0000 (+0900)
Subject: add S3_READ_TIMEOUT environment variable (#14952)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=7919418e4c445950cb526a42941186d1eb28c29e;p=mastodon.git

add S3_READ_TIMEOUT environment variable (#14952)
---

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index b4849370d..b841d5220 100644
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -62,7 +62,7 @@ if ENV['S3_ENABLED'] == 'true'
     s3_options: {
       signature_version: ENV.fetch('S3_SIGNATURE_VERSION') { 'v4' },
       http_open_timeout: ENV.fetch('S3_OPEN_TIMEOUT'){ '5' }.to_i,
-      http_read_timeout: 5,
+      http_read_timeout: ENV.fetch('S3_READ_TIMEOUT'){ '5' }.to_i,
       http_idle_timeout: 5,
       retry_limit: 0,
     }