From 60b55baca9e381deb3a0a85580f089f4caf551d4 Mon Sep 17 00:00:00 2001 From: Frederick Cheung Date: Sun, 22 May 2011 19:49:31 +0100 Subject: Take into account time spent in AR even if a redirect occurs or if it is after the render --- activerecord/lib/active_record/railties/controller_runtime.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/railties/controller_runtime.rb b/activerecord/lib/active_record/railties/controller_runtime.rb index fb3fd34665..44efb384fc 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_rt_after_render - runtime - db_rt_after_render + self.db_runtime = db_rt_before_render + db_during_render + runtime - db_during_render else super end @@ -32,7 +32,9 @@ module ActiveRecord def append_info_to_payload(payload) super - payload[:db_runtime] = db_runtime + if ActiveRecord::Base.connected? + payload[:db_runtime] = (db_runtime || 0) + ActiveRecord::LogSubscriber.reset_runtime + end end module ClassMethods -- cgit v1.2.3