Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 5757

Show
Ignore:
Timestamp:
12/19/06 23:16:10 (2 years ago)
Author:
bitsweat
Message:

Silence log_error deprecation warnings from inspecting deprecated instance variables.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/actionpack/CHANGELOG

    r5755 r5757  
    11*SVN* 
     2 
     3* Silence log_error deprecation warnings from inspecting deprecated instance variables.  [Nate Wiger] 
    24 
    35* Only cache GET requests with a 200 OK response.  #6514, #6743 [RSL, anamba] 
  • trunk/actionpack/lib/action_controller/rescue.rb

    r5706 r5757  
    6060      # Overwrite to implement custom logging of errors. By default logs as fatal. 
    6161      def log_error(exception) #:doc: 
    62         if ActionView::TemplateError === exception 
    63           logger.fatal(exception.to_s) 
    64         else 
    65           logger.fatal( 
    66             "\n\n#{exception.class} (#{exception.message}):\n    " + 
    67             clean_backtrace(exception).join("\n    ") + 
    68             "\n\n" 
    69           ) 
     62        ActiveSupport::Deprecation.silence do 
     63          if ActionView::TemplateError === exception 
     64            logger.fatal(exception.to_s) 
     65          else 
     66            logger.fatal( 
     67              "\n\n#{exception.class} (#{exception.message}):\n    " + 
     68              clean_backtrace(exception).join("\n    ") + 
     69              "\n\n" 
     70            ) 
     71          end 
    7072        end 
    7173      end 
  • trunk/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb

    r5730 r5757  
    4646  end 
    4747 
    48   def test_assertion_failed_error_doesnt_spout_deprecation_warnings 
     48  def test_log_error_silences_deprecation_warnings 
     49    get :raises_name_error 
     50  rescue => e 
     51    assert_not_deprecated { @controller.send :log_error, e } 
     52  end 
     53 
     54  def test_assertion_failed_error_silences_deprecation_warnings 
    4955    get :raises_name_error 
    5056  rescue => e