From: tateisu <tateisu@gmail.com>
Date: Mon, 2 Dec 2019 20:05:27 +0000 (+0900)
Subject: add S3_OPEN_TIMEOUT environment variable (#12459)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f1ef777d40235dc922a0b56da9fc00b98827c189;p=mastodon.git

add S3_OPEN_TIMEOUT environment variable (#12459)
---

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