]> cat aescling's git repositories - mastodon.git/commitdiff
Add timeouts for S3 (#9842)
authorEugen Rochko <eugen@zeonfederated.com>
Fri, 18 Jan 2019 00:36:59 +0000 (01:36 +0100)
committerGitHub <noreply@github.com>
Fri, 18 Jan 2019 00:36:59 +0000 (01:36 +0100)
config/initializers/paperclip.rb

index 4bbf8b827b54aa23a5997edf383015684b70f3ba..ce4185e024dbf92e7c02357e0dd37276a948ed3d 100644 (file)
@@ -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,
     }
   )