aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorJohn Firebaugh <john_firebaugh@us.ibm.com>2010-12-19 16:00:01 -0800
committerJosé Valim <jose.valim@gmail.com>2010-12-20 12:43:02 +0100
commite683ab7c390f26e110387822c7ffb5ac6aafebca (patch)
tree850338c758b99ff46ecd00e5c0780248a8c2e7b6 /activerecord
parent435bccda930e4dde3d0fafca958e1c8330b4c3ca (diff)
downloadrails-e683ab7c390f26e110387822c7ffb5ac6aafebca.tar.gz
rails-e683ab7c390f26e110387822c7ffb5ac6aafebca.tar.bz2
rails-e683ab7c390f26e110387822c7ffb5ac6aafebca.zip
Use AD::Reloader.to_cleanup for reloading [#2873 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/railtie.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
index ba455ea79d..61fb0ae468 100644
--- a/activerecord/lib/active_record/railtie.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -69,11 +69,9 @@ module ActiveRecord
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
- ActionDispatch::Callbacks.after do
- ActiveRecord::Base.clear_reloadable_connections!
- end
+ ActiveSupport.on_load(:active_record) do
+ ActionDispatch::Reloader.to_cleanup do
+ ActiveRecord::Base.clear_reloadable_connections!
end
end
end