diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-23 03:11:15 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-23 03:11:15 -0700 |
| commit | a8b2a895b795b02805a6d6478f7a8c55035e19d4 (patch) | |
| tree | 04d4e9c245b58ecfdc1529dda21fd2bbcf17be12 /activerecord/lib/active_record/railties | |
| parent | 6e5eedeb127f5bf9faf95460569931229a153cec (diff) | |
| parent | 8a722e09122a2beeb122a8931a08b72c46d6bc50 (diff) | |
| download | rails-a8b2a895b795b02805a6d6478f7a8c55035e19d4.tar.gz rails-a8b2a895b795b02805a6d6478f7a8c55035e19d4.tar.bz2 rails-a8b2a895b795b02805a6d6478f7a8c55035e19d4.zip | |
Merge pull request #1228 from fcheung/db_time_fix2
Take into account time spent in AR even if a redirect occurs or if it is after the render
Diffstat (limited to 'activerecord/lib/active_record/railties')
| -rw-r--r-- | activerecord/lib/active_record/railties/controller_runtime.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/railties/controller_runtime.rb b/activerecord/lib/active_record/railties/controller_runtime.rb index fb3fd34665..c5db9b4625 100644 --- a/activerecord/lib/active_record/railties/controller_runtime.rb +++ b/activerecord/lib/active_record/railties/controller_runtime.rb @@ -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 |