Merge remote-tracking branch 'upstream/pull/2863'

[rails.git] / config / initializers / active_storage.rb

diff --git a/config/initializers/active_storage.rb b/config/initializers/active_storage.rb
index 3d2c91265698304e7ac1bdf823a411c1c74d8d9d..042d7869502c7596f659e225774cfe18823691be 100644 (file)
--- a/config/initializers/active_storage.rb
+++ b/config/initializers/active_storage.rb
@@ -1,26 +1,29 @@
-Rails.configuration.after_initialize do
-  require "active_storage/service/s3_service"
-  require_dependency "active_storage/variant"
+Rails.application.config.active_storage.queues.analysis = :storage
+Rails.application.config.active_storage.queues.purge = :storage

 
 

-  module OpenStreetMap
-    module ActiveStorage
-      module Variant
-        private
+module OpenStreetMap
+  module ActiveStorage
+    module Variant
+      private

 
 

-        def upload(image)
-          File.open(image.path, "r") { |file| service.upload(key, file, :content_type => content_type) }
-        end
+      def upload(image)
+        File.open(image.path, "r") { |file| service.upload(key, file, :content_type => content_type) }

       end
       end

+    end

 
 

-      module S3Service
-        def upload(key, io, content_type:, **options)
-          @upload_options[:content_type] = content_type
-          super(key, io, **options)
-          @upload_options.delete(:content_type)
-        end
+    module S3Service
+      def upload(key, io, content_type:, **options)
+        @upload_options[:content_type] = content_type
+        super(key, io, **options)
+        @upload_options.delete(:content_type)

       end
     end
   end
       end
     end
   end

+end
+
+Rails.configuration.after_initialize do
+  require "active_storage/service/s3_service"
+  require_dependency "active_storage/variant"

 
   ActiveStorage::Variant.prepend(OpenStreetMap::ActiveStorage::Variant)
   ActiveStorage::Service::S3Service.prepend(OpenStreetMap::ActiveStorage::S3Service)
 
   ActiveStorage::Variant.prepend(OpenStreetMap::ActiveStorage::Variant)
   ActiveStorage::Service::S3Service.prepend(OpenStreetMap::ActiveStorage::S3Service)


@@ -28,4 +31,6 @@ Rails.configuration.after_initialize do
   ActiveSupport::Reloader.to_complete do
     ActiveStorage::Variant.prepend(OpenStreetMap::ActiveStorage::Variant)
   end
   ActiveSupport::Reloader.to_complete do
     ActiveStorage::Variant.prepend(OpenStreetMap::ActiveStorage::Variant)
   end

+
+  ActiveStorage.service_urls_expire_in = 1.week

 end
 end