diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-08-20 18:55:02 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-08-20 18:55:02 -0700 |
commit | c211d904ba358d3d1ae85d56fa3a805ea505c23a (patch) | |
tree | ccdf273abc0c7cc63327efc2535eb3fc79784185 /activerecord | |
parent | 3cd9627bd827265229781013bfa1cbbfff2a0a6c (diff) | |
download | rails-c211d904ba358d3d1ae85d56fa3a805ea505c23a.tar.gz rails-c211d904ba358d3d1ae85d56fa3a805ea505c23a.tar.bz2 rails-c211d904ba358d3d1ae85d56fa3a805ea505c23a.zip |
Revert "Just add connection management middleware if running in a concurrent environment."
This reverts commit 6b29dc876fe185881d46731c3ae170478a3828fe.
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/railtie.rb | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index 78fdb77216..94dda4e413 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -16,7 +16,11 @@ module ActiveRecord config.generators.orm :active_record, :migration => true, :timestamps => true - config.app_middleware.insert_after "::ActionDispatch::Callbacks", "ActiveRecord::QueryCache" + config.app_middleware.insert_after "::ActionDispatch::Callbacks", + "ActiveRecord::QueryCache" + + config.app_middleware.insert_after "::ActionDispatch::Callbacks", + "ActiveRecord::ConnectionAdapters::ConnectionManagement" rake_tasks do load "active_record/railties/databases.rake" @@ -74,13 +78,6 @@ module ActiveRecord end end - initializer "active_record.add_concurrency_middleware" do |app| - if app.config.allow_concurrency - app.config.middleware.insert_after "::ActionDispatch::Callbacks", - "ActiveRecord::ConnectionAdapters::ConnectionManagement" - end - end - config.after_initialize do ActiveSupport.on_load(:active_record) do instantiate_observers |