diff options
| author | José Valim <jose.valim@gmail.com> | 2010-07-25 16:42:05 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-07-25 16:42:05 +0200 |
| commit | 82c7ef837d32897717b7c6e54cfa6f00d218a242 (patch) | |
| tree | 9d1889930f769e13d818c7b7a8d792a854def9f1 /activerecord/lib/active_record/railties | |
| parent | b1cfcedc8f6dde3b0855fc8fd564e72e730ba5cf (diff) | |
| download | rails-82c7ef837d32897717b7c6e54cfa6f00d218a242.tar.gz rails-82c7ef837d32897717b7c6e54cfa6f00d218a242.tar.bz2 rails-82c7ef837d32897717b7c6e54cfa6f00d218a242.zip | |
Move runtime to log subscriber.
Diffstat (limited to 'activerecord/lib/active_record/railties')
| -rw-r--r-- | activerecord/lib/active_record/railties/controller_runtime.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/railties/controller_runtime.rb b/activerecord/lib/active_record/railties/controller_runtime.rb index aed1c59b00..bc6ca936c0 100644 --- a/activerecord/lib/active_record/railties/controller_runtime.rb +++ b/activerecord/lib/active_record/railties/controller_runtime.rb @@ -11,9 +11,9 @@ module ActiveRecord def cleanup_view_runtime if ActiveRecord::Base.connected? - db_rt_before_render = ActiveRecord::Base.connection.reset_runtime + db_rt_before_render = ActiveRecord::LogSubscriber.reset_runtime runtime = super - db_rt_after_render = ActiveRecord::Base.connection.reset_runtime + db_rt_after_render = ActiveRecord::LogSubscriber.reset_runtime self.db_runtime = db_rt_before_render + db_rt_after_render runtime - db_rt_after_render else |