Merge pull request #11780 from thedarkone/logger-naked-rescue-fix

Rack::Logger naked rescue fix
rails · Aug 6, 2013 · b7f2ccd · b7f2ccd
2 parents 48e3c46 + a0907bb
commit b7f2ccd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/railties/lib/rails/rack/logger.rb b/railties/lib/rails/rack/logger.rb
@@ -38,7 +38,7 @@ def call_app(request, env)
         resp = @app.call(env)
         resp[2] = ::Rack::BodyProxy.new(resp[2]) { finish(request) }
         resp
-      rescue
+      rescue Exception
         finish(request)
         raise
       ensure

diff --git a/railties/test/rack_logger_test.rb b/railties/test/rack_logger_test.rb
@@ -1,3 +1,4 @@
+require 'abstract_unit'
 require 'active_support/testing/autorun'
 require 'active_support/test_case'
 require 'rails/rack/logger'
@@ -56,11 +57,14 @@ def test_notification
       end
 
       def test_notification_on_raise
-        logger = TestLogger.new { raise }
+        logger = TestLogger.new do
+          # using an exception class that is not a StandardError subclass on purpose
+          raise NotImplementedError
+        end
 
         assert_difference('subscriber.starts.length') do
           assert_difference('subscriber.finishes.length') do
-            assert_raises(RuntimeError) do
+            assert_raises(NotImplementedError) do
               logger.call 'REQUEST_METHOD' => 'GET'
             end
           end