Merge pull request #6759 from dylanahsmith/only-catch-standard-error

Avoid unnecessary catching of Exception instead of StandardError.

2 files changed, 2 insertions, 2 deletions

diff --git a/activesupport/lib/active_support/log_subscriber.rb b/activesupport/lib/active_support/log_subscriber.rb
index bea2ca17f1..d5f0e3fa6c 100644
--- a/activesupport/lib/active_support/log_subscriber.rb
+++ b/activesupport/lib/active_support/log_subscriber.rb
@@ -92,7 +92,7 @@ module ActiveSupport
       method = message.split('.').first
       begin
         send(method, ActiveSupport::Notifications::Event.new(message, *args))
-      rescue Exception => e
+      rescue => e
         logger.error "Could not log #{message.inspect} event. #{e.class}: #{e.message} #{e.backtrace}"
       end
     end
diff --git a/activesupport/lib/active_support/multibyte/unicode.rb b/activesupport/lib/active_support/multibyte/unicode.rb
index 678f551193..ef1711c60a 100644
--- a/activesupport/lib/active_support/multibyte/unicode.rb
+++ b/activesupport/lib/active_support/multibyte/unicode.rb
@@ -331,7 +331,7 @@ module ActiveSupport
         def load
           begin
             @codepoints, @composition_exclusion, @composition_map, @boundary, @cp1252 = File.open(self.class.filename, 'rb') { |f| Marshal.load f.read }
-          rescue Exception => e
+          rescue => e
               raise IOError.new("Couldn't load the Unicode tables for UTF8Handler (#{e.message}), ActiveSupport::Multibyte is unusable")
           end