diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2011-05-22 18:10:52 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2011-05-22 18:10:52 -0500 |
| commit | ba3ea9c90b000d8520944b51b2f6d41af148090c (patch) | |
| tree | f92af256a852ea4cd37f4a047549ab5423984d42 | |
| parent | 7124659f3ec0f7d732628a5c1dc1aa8e719aa0ae (diff) | |
| download | rails-ba3ea9c90b000d8520944b51b2f6d41af148090c.tar.gz rails-ba3ea9c90b000d8520944b51b2f6d41af148090c.tar.bz2 rails-ba3ea9c90b000d8520944b51b2f6d41af148090c.zip | |
Revert "Take into account time spent in AR even if a redirect occurs or if it is after the render" because it's causing test failures about missing db_during_render.
This reverts commit 60b55baca9e381deb3a0a85580f089f4caf551d4.
| -rw-r--r-- | actionpack/test/activerecord/controller_runtime_test.rb | 26 | ||||
| -rw-r--r-- | activerecord/lib/active_record/railties/controller_runtime.rb | 8 |
2 files changed, 3 insertions, 31 deletions
diff --git a/actionpack/test/activerecord/controller_runtime_test.rb b/actionpack/test/activerecord/controller_runtime_test.rb index 2d789395ce..b87b9f9c47 100644 --- a/actionpack/test/activerecord/controller_runtime_test.rb +++ b/actionpack/test/activerecord/controller_runtime_test.rb @@ -15,17 +15,6 @@ class ControllerRuntimeLogSubscriberTest < ActionController::TestCase def zero render :inline => "Zero DB runtime" end - - def redirect - Project.all - redirect_to :action => 'show' - end - - def db_after_render - render :inline => "Hello world" - Project.all - ActiveRecord::LogSubscriber.runtime += 100 - end end include ActiveSupport::LogSubscriber::TestHelper @@ -63,19 +52,4 @@ class ControllerRuntimeLogSubscriberTest < ActionController::TestCase assert_equal 2, @logger.logged(:info).size assert_match(/\(Views: [\d.]+ms \| ActiveRecord: 0.0ms\)/, @logger.logged(:info)[1]) end - - def test_log_with_active_record_when_redirecting - get :redirect - wait - assert_equal 3, @logger.logged(:info).size - assert_match(/\(ActiveRecord: [\d.]+ms\)/, @logger.logged(:info)[2]) - end - - def test_include_time_query_time_after_rendering - get :db_after_render - wait - - assert_equal 2, @logger.logged(:info).size - assert_match(/\(Views: [\d.]+ms \| ActiveRecord: ([1-9][\d.]+)ms\)/, @logger.logged(:info)[1]) - end end diff --git a/activerecord/lib/active_record/railties/controller_runtime.rb b/activerecord/lib/active_record/railties/controller_runtime.rb index 44efb384fc..fb3fd34665 100644 --- a/activerecord/lib/active_record/railties/controller_runtime.rb +++ b/activerecord/lib/active_record/railties/controller_runtime.rb @@ -23,8 +23,8 @@ module ActiveRecord db_rt_before_render = ActiveRecord::LogSubscriber.reset_runtime runtime = super db_rt_after_render = ActiveRecord::LogSubscriber.reset_runtime - self.db_runtime = db_rt_before_render + db_during_render - runtime - db_during_render + self.db_runtime = db_rt_before_render + db_rt_after_render + runtime - db_rt_after_render else super end @@ -32,9 +32,7 @@ module ActiveRecord def append_info_to_payload(payload) super - if ActiveRecord::Base.connected? - payload[:db_runtime] = (db_runtime || 0) + ActiveRecord::LogSubscriber.reset_runtime - end + payload[:db_runtime] = db_runtime end module ClassMethods |