aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-12-19 23:16:10 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-12-19 23:16:10 +0000
commit9a27b29755027d7b2cb5e255276619485f4f5d02 (patch)
tree17ffcd53a39fde492381d3ac3367488115b49b28 /actionpack/lib
parente56bd3a121d1b9ae1d89a335cc39ff9aef36789e (diff)
downloadrails-9a27b29755027d7b2cb5e255276619485f4f5d02.tar.gz
rails-9a27b29755027d7b2cb5e255276619485f4f5d02.tar.bz2
rails-9a27b29755027d7b2cb5e255276619485f4f5d02.zip
Silence log_error deprecation warnings from inspecting deprecated instance variables.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5757 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/rescue.rb18
1 files changed, 10 insertions, 8 deletions
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