]> cat aescling's git repositories - mastodon.git/commitdiff
add S3_OPEN_TIMEOUT environment variable (#12459)
authortateisu <tateisu@gmail.com>
Mon, 2 Dec 2019 20:05:27 +0000 (05:05 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Mon, 2 Dec 2019 20:05:27 +0000 (21:05 +0100)
config/initializers/paperclip.rb

index d3602e655e6083d74d14143c3afd52a898d8a921..96607b7ce80f9745f740399277caca774a57b91c 100644 (file)
@@ -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,