diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-07-12 03:29:59 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-07-17 05:13:56 -0300 |
| commit | 9d0491937e520ac968919f7765b1209912d882a2 (patch) | |
| tree | cd4daf99fa419994232e8e3bdc2acf7d2e4f7b22 /activerecord/lib/active_record/railties | |
| parent | bbbabc22c102418251f25899766772a0a1853639 (diff) | |
| download | rails-9d0491937e520ac968919f7765b1209912d882a2.tar.gz rails-9d0491937e520ac968919f7765b1209912d882a2.tar.bz2 rails-9d0491937e520ac968919f7765b1209912d882a2.zip | |
Check if the logger exists before trying to use it
Diffstat (limited to 'activerecord/lib/active_record/railties')
| -rw-r--r-- | activerecord/lib/active_record/railties/controller_runtime.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/railties/controller_runtime.rb b/activerecord/lib/active_record/railties/controller_runtime.rb index 8727e46cb3..c13238cbe2 100644 --- a/activerecord/lib/active_record/railties/controller_runtime.rb +++ b/activerecord/lib/active_record/railties/controller_runtime.rb @@ -19,7 +19,7 @@ module ActiveRecord end def cleanup_view_runtime - if logger.info? && ActiveRecord::Base.connected? + if logger && logger.info? && ActiveRecord::Base.connected? db_rt_before_render = ActiveRecord::LogSubscriber.reset_runtime self.db_runtime = (db_runtime || 0) + db_rt_before_render runtime = super |