Browse Source

Fix Paperclip timeout setting. Fix bug introduced in #437

Eugen Rochko 7 years ago
parent
commit
2e71bb031b
2 changed files with 5 additions and 3 deletions
  1. 4 2
      app/models/account.rb
  2. 1 1
      config/initializers/paperclip.rb

+ 4 - 2
app/models/account.rb

@@ -190,8 +190,10 @@ class Account < ApplicationRecord
       follow_mapping(FollowRequest.where(target_account_id: target_account_ids, account_id: account_id), :target_account_id)
     end
     
-    private def follow_mapping(query, field)
-      query.pluck(field).inject({}) { |mapping, id| mapping[id] = true }
+    private
+
+    def follow_mapping(query, field)
+      query.pluck(field).inject({}) { |mapping, id| mapping[id] = true; mapping }
     end
   end
 

+ 1 - 1
config/initializers/paperclip.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-Paperclip::Attachment.default_options[:read_timeout] = 60
+Paperclip.options[:read_timeout] = 60
 
 if ENV['S3_ENABLED'] == 'true'
   Aws.eager_autoload!(services: %w(S3))