Merge pull request #30118 from georgeclaghorn/active-storage-load-hooks

Set ActiveStorage::Blob.service when ActiveStorage::Blob is loaded

1 files changed, 15 insertions, 16 deletions

diff --git a/activestorage/lib/active_storage/engine.rb b/activestorage/lib/active_storage/engine.rb
index da83d3908a..d5bc70fc0c 100644
--- a/activestorage/lib/active_storage/engine.rb
+++ b/activestorage/lib/active_storage/engine.rb
@@ -34,22 +34,21 @@ module ActiveStorage
     end
 
     initializer "active_storage.services" do
-      config.after_initialize do |app|
-        if config_choice = app.config.active_storage.service
-          config_file = Pathname.new(Rails.root.join("config/storage.yml"))
-          raise("Couldn't find Active Storage configuration in #{config_file}") unless config_file.exist?
-
-          require "yaml"
-          require "erb"
-
-          configs =
-            begin
-              YAML.load(ERB.new(config_file.read).result) || {}
-            rescue Psych::SyntaxError => e
-              raise "YAML syntax error occurred while parsing #{config_file}. " \
-                    "Please note that YAML must be consistently indented using spaces. Tabs are not allowed. " \
-                    "Error: #{e.message}"
-            end
+      config.to_prepare do
+        if config_choice = Rails.configuration.active_storage.service
+          configs = Rails.configuration.active_storage.service_configurations ||= begin
+            config_file = Pathname.new(Rails.root.join("config/storage.yml"))
+            raise("Couldn't find Active Storage configuration in #{config_file}") unless config_file.exist?
+
+            require "yaml"
+            require "erb"
+
+            YAML.load(ERB.new(config_file.read).result) || {}
+          rescue Psych::SyntaxError => e
+            raise "YAML syntax error occurred while parsing #{config_file}. " \
+                  "Please note that YAML must be consistently indented using spaces. Tabs are not allowed. " \
+                  "Error: #{e.message}"
+          end
 
           ActiveStorage::Blob.service =
             begin