diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/rescue.rb | 18 | ||||
| -rw-r--r-- | actionpack/test/controller/deprecation/deprecated_base_methods_test.rb | 8 |
3 files changed, 19 insertions, 9 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 8050fb4722..807876f1ce 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Silence log_error deprecation warnings from inspecting deprecated instance variables. [Nate Wiger] + * Only cache GET requests with a 200 OK response. #6514, #6743 [RSL, anamba] * Add a 'referer' attribute to TestRequest. [Jamis Buck] diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb index 01969e867c..035047085d 100644 --- a/actionpack/lib/action_controller/rescue.rb +++ b/actionpack/lib/action_controller/rescue.rb @@ -59,14 +59,16 @@ module ActionController #:nodoc: # Overwrite to implement custom logging of errors. By default logs as fatal. def log_error(exception) #:doc: - if ActionView::TemplateError === exception - logger.fatal(exception.to_s) - else - logger.fatal( - "\n\n#{exception.class} (#{exception.message}):\n " + - clean_backtrace(exception).join("\n ") + - "\n\n" - ) + ActiveSupport::Deprecation.silence do + if ActionView::TemplateError === exception + logger.fatal(exception.to_s) + else + logger.fatal( + "\n\n#{exception.class} (#{exception.message}):\n " + + clean_backtrace(exception).join("\n ") + + "\n\n" + ) + end end end diff --git a/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb b/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb index 627e6d2627..d8da676f96 100644 --- a/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb +++ b/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb @@ -45,7 +45,13 @@ class DeprecatedBaseMethodsTest < Test::Unit::TestCase assert_equal "Living in a nested world", @response.body end - def test_assertion_failed_error_doesnt_spout_deprecation_warnings + def test_log_error_silences_deprecation_warnings + get :raises_name_error + rescue => e + assert_not_deprecated { @controller.send :log_error, e } + end + + def test_assertion_failed_error_silences_deprecation_warnings get :raises_name_error rescue => e error = Test::Unit::Error.new('testing ur doodz', e) |