diff options
author | Dylan Smith <Dylan.Smith@shopify.com> | 2012-06-17 03:26:10 -0400 |
---|---|---|
committer | Dylan Smith <Dylan.Smith@shopify.com> | 2012-06-17 03:50:14 -0400 |
commit | c9891608aa1e5ebbab04afe73bf7a28748001804 (patch) | |
tree | 4e17cc4624136daa1f720ba47d92f126478cb3a3 /activesupport/lib/active_support | |
parent | 7381968c08a1a6a6c6f5bf02ac461b1cc63778f2 (diff) | |
download | rails-c9891608aa1e5ebbab04afe73bf7a28748001804.tar.gz rails-c9891608aa1e5ebbab04afe73bf7a28748001804.tar.bz2 rails-c9891608aa1e5ebbab04afe73bf7a28748001804.zip |
Avoid unnecessary catching of Exception instead of StandardError.
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r-- | activesupport/lib/active_support/log_subscriber.rb | 2 | ||||
-rw-r--r-- | activesupport/lib/active_support/multibyte/unicode.rb | 2 |
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 |