From 75fa82418d54b36b6092767f2a2b5c1d5324441b Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Wed, 10 Dec 2008 18:07:02 -0600 Subject: Prefer Rails.logger over RAILS_DEFAULT_LOGGER --- actionpack/lib/action_controller/failsafe.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actionpack/lib/action_controller') 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 -- cgit v1.2.3