diff options
| author | Tom Ward <tom@popdog.net> | 2011-05-14 10:31:00 +0100 |
|---|---|---|
| committer | Tom Ward <tom@popdog.net> | 2011-05-14 10:39:01 +0100 |
| commit | 6d961242848ffe0eac69f190fd02f44aaeef3e0a (patch) | |
| tree | 6e902ccc598cf02e2f28fcb4dab7145b01619357 /activerecord | |
| parent | 518ffcd168776cfaaae49faad9650621b32f148e (diff) | |
| download | rails-6d961242848ffe0eac69f190fd02f44aaeef3e0a.tar.gz rails-6d961242848ffe0eac69f190fd02f44aaeef3e0a.tar.bz2 rails-6d961242848ffe0eac69f190fd02f44aaeef3e0a.zip | |
Reset ActiveRecord::LogSubscriber runtime at the start of each request
Previously the runtime was reset implicitly when #cleanup_view_runtime was called at the end of most requests. However, this doesn't happen when the request redirects, or send_file is called. Consequently, the ActiveRecord runtime recorded in the logs included the time taken for both the current request and the previous redirect. Explicitly resetting at the start of each request ensures that this can't happen, no matter what occurs previously.
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/railties/controller_runtime.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/railties/controller_runtime.rb b/activerecord/lib/active_record/railties/controller_runtime.rb index bc6ca936c0..a0eecf4f46 100644 --- a/activerecord/lib/active_record/railties/controller_runtime.rb +++ b/activerecord/lib/active_record/railties/controller_runtime.rb @@ -9,6 +9,11 @@ module ActiveRecord attr_internal :db_runtime + def process_action(action, *args) + ActiveRecord::LogSubscriber.reset_runtime + super + end + def cleanup_view_runtime if ActiveRecord::Base.connected? db_rt_before_render = ActiveRecord::LogSubscriber.reset_runtime |