diff options
| author | Joshua Peek <josh@joshpeek.com> | 2008-12-10 18:07:02 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2008-12-10 18:08:14 -0600 |
| commit | 75fa82418d54b36b6092767f2a2b5c1d5324441b (patch) | |
| tree | 965aa9dea789dd06576a54e7658a64c4560bad09 /actionpack/lib/action_controller | |
| parent | 455c7f9e37fda2969e52698b766413fc735eb488 (diff) | |
| download | rails-75fa82418d54b36b6092767f2a2b5c1d5324441b.tar.gz rails-75fa82418d54b36b6092767f2a2b5c1d5324441b.tar.bz2 rails-75fa82418d54b36b6092767f2a2b5c1d5324441b.zip | |
Prefer Rails.logger over RAILS_DEFAULT_LOGGER
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/failsafe.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/failsafe.rb b/actionpack/lib/action_controller/failsafe.rb index bb6ef39470..1cd649b2e1 100644 --- a/actionpack/lib/action_controller/failsafe.rb +++ b/actionpack/lib/action_controller/failsafe.rb @@ -42,8 +42,8 @@ module ActionController end def failsafe_logger - if defined?(::RAILS_DEFAULT_LOGGER) && !::RAILS_DEFAULT_LOGGER.nil? - ::RAILS_DEFAULT_LOGGER + if defined? Rails && Rails.logger + Rails.logger else Logger.new($stderr) end |