Skip to content
Browse files

Merge [6140] from trunk.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6141 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent e73bdfc commit e41f4894c419944ddd2fddca204b853d004c2ece @jeremy jeremy committed
Showing with 10 additions and 4 deletions.
  1. +7 −2 activesupport/CHANGELOG
  2. +3 −2 activesupport/lib/active_support/deprecation.rb
View
9 activesupport/CHANGELOG
@@ -1,8 +1,13 @@
+*SVN*
+
+* Deprecation: warn on stderr if RAILS_DEFAULT_LOGGER isn't set yet. [Jeremy Kemper]
+
+
*1.4.1* (February 5th, 2007)
-* Optimize Class Inheritable Attributes so that unnecessary hashes are not created. [Bruce Perens]
+* Optimize Class Inheritable Attributes so that unnecessary hashes are not created. Closes #7472 [Bruce Perens]
-* Added :instance_writer option to #mattr_writer/accessor, #cattr_writer/accessor, and #class_inheritable_writer to skip the creation of the instance writer. [Rick]
+* Added :instance_writer option to #mattr_writer/accessor, #cattr_writer/accessor, and #class_inheritable_writer to skip the creation of the instance writer. [Rick]
* Full test coverage for Inflector. #7228 [Dan Kubb]
View
5 activesupport/lib/active_support/deprecation.rb
@@ -13,8 +13,9 @@ module Deprecation #:nodoc:
$stderr.puts callstack.join("\n ") if debug
},
'development' => Proc.new { |message, callstack|
- RAILS_DEFAULT_LOGGER.warn message
- RAILS_DEFAULT_LOGGER.debug callstack.join("\n ") if debug
+ logger = defined?(::RAILS_DEFAULT_LOGGER) ? ::RAILS_DEFAULT_LOGGER : Logger.new($stderr)
+ logger.warn message
+ logger.debug callstack.join("\n ") if debug
}
}

0 comments on commit e41f489

Please sign in to comment.
Something went wrong with that request. Please try again.