From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 18 Jan 2019 00:36:59 +0000 (+0100)
Subject: Add timeouts for S3 (#9842)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=4699cf853c8533cfca1f356d6c9e430c16b75335;p=mastodon.git

Add timeouts for S3 (#9842)
---

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index 4bbf8b827..ce4185e02 100644
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -36,6 +36,9 @@ if ENV['S3_ENABLED'] == 'true'
     },
     s3_options: {
       signature_version: ENV.fetch('S3_SIGNATURE_VERSION') { 'v4' },
+      http_open_timeout: 5,
+      http_read_timeout: 5,
+      http_idle_timeout: 5,
     }
   )