From: Eugen Rochko Date: Sat, 7 Jan 2017 14:43:56 +0000 (+0100) Subject: Add read timeout to paperclip when it's downloading remote images X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=7ddec6e7c3a8bdfcc69d28a723caca61cdb2a17c;p=mastodon.git Add read timeout to paperclip when it's downloading remote images --- diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index cb7ed4487..4d6154562 100644 --- a/config/initializers/paperclip.rb +++ b/config/initializers/paperclip.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +Paperclip::Attachment.default_options[:read_timeout] = 60 + if ENV['S3_ENABLED'] == 'true' Aws.eager_autoload!(services: %w(S3))