diff options
author | Jon Leighton <j@jonathanleighton.com> | 2012-06-15 12:09:19 +0100 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2012-06-15 19:15:36 +0100 |
commit | 61826bcca3481a85649be714a91a45ca909f2726 (patch) | |
tree | e31b141c91f3f67ffc135f89c4ce5841a1e7ca5c /activerecord/lib/active_record/railtie.rb | |
parent | 9abe0980a60d113caf1115eddcc41e2a2446eff1 (diff) | |
download | rails-61826bcca3481a85649be714a91a45ca909f2726.tar.gz rails-61826bcca3481a85649be714a91a45ca909f2726.tar.bz2 rails-61826bcca3481a85649be714a91a45ca909f2726.zip |
refactor
Diffstat (limited to 'activerecord/lib/active_record/railtie.rb')
-rw-r--r-- | activerecord/lib/active_record/railtie.rb | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index 319516413b..fb5f41ced2 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -97,18 +97,12 @@ module ActiveRecord end initializer "active_record.set_reloader_hooks" do |app| - hook = lambda do - ActiveRecord::Base.clear_reloadable_connections! - ActiveRecord::Base.clear_cache! - end + hook = app.config.reload_classes_only_on_change ? :to_prepare : :to_cleanup - if app.config.reload_classes_only_on_change - ActiveSupport.on_load(:active_record) do - ActionDispatch::Reloader.to_prepare(&hook) - end - else - ActiveSupport.on_load(:active_record) do - ActionDispatch::Reloader.to_cleanup(&hook) + ActiveSupport.on_load(:active_record) do + ActionDispatch::Reloader.send(hook) do + ActiveRecord::Base.clear_reloadable_connections! + ActiveRecord::Base.clear_cache! end end end |