Use AD::Reloader.to_cleanup for reloading [rails#2873 state:resolved]

bigfix · Dec 20, 2010 · 3b90dc0 · 3b90dc0
1 parent b39f753
commit 3b90dc0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
@@ -69,11 +69,9 @@ class Railtie < Rails::Railtie
     end
 
     initializer "active_record.set_dispatch_hooks", :before => :set_clear_dependencies_hook do |app|
-      unless app.config.cache_classes
+      ActiveSupport.on_load(:active_record) do
-        ActiveSupport.on_load(:active_record) do
+        ActionDispatch::Reloader.to_cleanup do
-          ActionDispatch::Callbacks.after do
+          ActiveRecord::Base.clear_reloadable_connections!
-            ActiveRecord::Base.clear_reloadable_connections!
-          end
         end
       end
     end

diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb
@@ -51,11 +51,9 @@ module Bootstrap
       end
 
       initializer :set_clear_dependencies_hook do
-        unless config.cache_classes
+        ActionDispatch::Reloader.to_cleanup do
-          ActionDispatch::Callbacks.after do
+          ActiveSupport::DescendantsTracker.clear
-            ActiveSupport::DescendantsTracker.clear
+          ActiveSupport::Dependencies.clear
-            ActiveSupport::Dependencies.clear
-          end
         end
       end