Don't rescue Exception class (#31387).

Patch by Go MAEDA and Pavel Rosický.


git-svn-id: http://svn.redmine.org/redmine/trunk@18197 e93f8b46-1217-0410-a6f0-8f06a7374b81

Author: vividtone

app/controllers/admin_controller.rb

@@ -54,7 +54,7 @@ def default_configuration
       begin
         Redmine::DefaultData::Loader::load(params[:lang])
         flash[:notice] = l(:notice_default_data_loaded)
-      rescue Exception => e
+      rescue => e
         flash[:error] = l(:error_can_t_load_default_data, ERB::Util.h(e.message))
       end
     end
@@ -65,7 +65,7 @@ def test_email
     begin
       Mailer.deliver_test_email(User.current)
       flash[:notice] = l(:notice_email_sent, ERB::Util.h(User.current.mail))
-    rescue Exception => e
+    rescue => e
       flash[:error] = l(:notice_email_error, ERB::Util.h(Redmine::CodesetUtil.replace_invalid_utf8(e.message.dup)))
     end
     redirect_to settings_path(:tab => 'notifications')

app/controllers/auth_sources_controller.rb

@@ -60,7 +60,7 @@ def test_connection
     begin
       @auth_source.test_connection
       flash[:notice] = l(:notice_successful_connection)
-    rescue Exception => e
+    rescue => e
       flash[:error] = l(:error_unable_to_connect, e.message)
     end
     redirect_to auth_sources_path

app/controllers/issue_statuses_controller.rb

@@ -74,7 +74,7 @@ def update
   def destroy
     IssueStatus.find(params[:id]).destroy
     redirect_to issue_statuses_path
-  rescue Exception => e
+  rescue => e
     flash[:error] = l(:error_unable_delete_issue_status, ERB::Util.h(e.message))
     redirect_to issue_statuses_path
   end

app/models/import.rb

@@ -67,7 +67,7 @@ def set_default_settings
       begin
         content = File.read(filepath, 256)
         separator = [',', ';'].sort_by {|sep| content.count(sep) }.last
-      rescue Exception => e
+      rescue => e
       end
     end
     wrapper = '"'
@@ -272,7 +272,7 @@ def remove_file
     if file_exists?
       begin
         File.delete filepath
-      rescue Exception => e
+      rescue => e
         logger.error "Unable to delete file #{filepath}: #{e.message}" if logger
       end
     end

app/models/mail_handler.rb

@@ -53,7 +53,7 @@ def self.receive(raw_mail, options={})
   # Receives an email and rescues any exception
   def self.safe_receive(*args)
     receive(*args)
-  rescue Exception => e
+  rescue => e
     Rails.logger.error "MailHandler: an unexpected error occurred when receiving email: #{e.message}"
     return false
   end

app/models/mailer.rb

@@ -705,7 +705,7 @@ def self.deliver_mail(mail)
       # Log errors when raise_delivery_errors is set to false, Rails does not
       mail.raise_delivery_errors = true
       super
-    rescue Exception => e
+    rescue => e
       if ActionMailer::Base.raise_delivery_errors
         raise e
       else

app/models/query.rb

@@ -327,7 +327,7 @@ def self.visible(*args)
     if self == ::Query
       # Visibility depends on permissions for each subclass,
       # raise an error if the scope is called from Query (eg. Query.visible)
-      raise Exception.new("Cannot call .visible scope from the base Query class, but from subclasses only.")
+      raise "Cannot call .visible scope from the base Query class, but from subclasses only."
     end
 
     user = args.shift || User.current

app/models/repository.rb

@@ -382,7 +382,7 @@ def self.scm_command
     ret = ""
     begin
       ret = self.scm_adapter_class.client_command if self.scm_adapter_class
-    rescue Exception => e
+    rescue => e
       logger.error "scm: error during get command: #{e.message}"
     end
     ret
@@ -392,7 +392,7 @@ def self.scm_version_string
     ret = ""
     begin
       ret = self.scm_adapter_class.client_version_string if self.scm_adapter_class
-    rescue Exception => e
+    rescue => e
       logger.error "scm: error during get version string: #{e.message}"
     end
     ret
@@ -402,7 +402,7 @@ def self.scm_available
     ret = false
     begin
       ret = self.scm_adapter_class.client_available if self.scm_adapter_class
-    rescue Exception => e
+    rescue => e
       logger.error "scm: error during get scm available: #{e.message}"
     end
     ret

app/models/repository/git.rb

@@ -84,7 +84,7 @@ def tags
 
   def default_branch
     scm.default_branch
-  rescue Exception => e
+  rescue => e
     logger.error "git: error during get default branch: #{e.message}"
     nil
   end

app/models/tracker.rb

@@ -142,6 +142,6 @@ def self.core_fields(trackers)
 
 private
   def check_integrity
-    raise Exception.new("Cannot delete tracker") if Issue.where(:tracker_id => self.id).any?
+    raise "Cannot delete tracker" if Issue.where(:tracker_id => self.id).any?
   end
 end

bin/changelog.rb

@@ -133,7 +133,7 @@ def parse_pagination_items_span_content
 
         begin
           raise if items_per_page == 0 || @no_of_issues == 0
-        rescue Exception => e
+        rescue => e
           puts "No changelog items to process.\n" +
                "Make sure to provide a valid version id as the -i parameter."
           exit

config/routes.rb

@@ -357,7 +357,7 @@
     if File.exists?(file)
       begin
         instance_eval File.read(file)
-      rescue Exception => e
+      rescue SyntaxError, StandardError => e
         puts "An error occurred while loading the routes definition of #{File.basename(plugin_dir)} plugin (#{file}): #{e.message}."
         exit 1
       end

extra/mail_handler/rdm-mailhandler.rb

@@ -204,7 +204,7 @@ def debug(msg)
   def read_key_from_file(filename)
     begin
       self.key = File.read(filename).strip
-    rescue Exception => e
+    rescue => e
       $stderr.puts "Unable to read the key from #{filename}:\n#{e.message}"
       exit 1
     end

extra/svn/reposman.rb

@@ -54,7 +54,7 @@ def self.create(path)
 def read_key_from_file(filename)
   begin
     $api_key = File.read(filename).strip
-  rescue Exception => e
+  rescue => e
     $stderr.puts "Unable to read the key from #{filename}: #{e.message}"
     exit 1
   end

lib/redmine/plugin.rb

@@ -422,7 +422,7 @@ def mirror_assets
         base_target_dir = File.join(destination, File.dirname(source_files.first).gsub(source, ''))
         begin
           FileUtils.mkdir_p(base_target_dir)
-        rescue Exception => e
+        rescue => e
           raise "Could not create directory #{base_target_dir}: " + e.message
         end
       end
@@ -433,7 +433,7 @@ def mirror_assets
         target_dir = File.join(destination, dir.gsub(source, ''))
         begin
           FileUtils.mkdir_p(target_dir)
-        rescue Exception => e
+        rescue => e
           raise "Could not create directory #{target_dir}: " + e.message
         end
       end
@@ -444,7 +444,7 @@ def mirror_assets
           unless File.exist?(target) && FileUtils.identical?(file, target)
             FileUtils.cp(file, target)
           end
-        rescue Exception => e
+        rescue => e
           raise "Could not copy #{file} to #{target}: " + e.message
         end
       end

lib/redmine/scm/adapters/abstract_adapter.rb

@@ -247,11 +247,7 @@ def self.shellout(cmd, options = {}, &block)
               io.close_write unless options[:write_stdin]
               block.call(io) if block_given?
             end
-          ## If scm command does not exist,
-          ## Linux JRuby 1.6.2 (ruby-1.8.7-p330) raises java.io.IOException
-          ## in production environment.
-          # rescue Errno::ENOENT => e
-          rescue Exception => e
+          rescue => e
             msg = strip_credential(e.message)
             # The command failed, log it and re-raise
             logmsg = "SCM command failed, "
@@ -282,7 +278,7 @@ def scm_iconv(to, from, str)
           str.force_encoding(from)
           begin
             str.encode(to)
-          rescue Exception => err
+          rescue => err
             logger.error("failed to convert from #{from} to #{to}. #{err}")
             nil
           end

lib/redmine/scm/adapters/mercurial_adapter.rb

@@ -92,7 +92,7 @@ def info
                    :lastrev => Revision.new(:revision => tip['revision'],
                                             :scmid => tip['node']))
         # rescue HgCommandAborted
-        rescue Exception => e
+        rescue => e
           logger.error "hg: error during getting info: #{e.message}"
           nil
         end

lib/redmine/scm/adapters/subversion_adapter.rb

@@ -115,7 +115,7 @@ def entries(path=nil, identifier=nil, options={})
                               })
                             })
               end
-            rescue Exception => e
+            rescue => e
               logger.error("Error parsing svn output: #{e.message}")
               logger.error("Output was:\n #{output}")
             end

lib/tasks/email.rake

@@ -164,7 +164,7 @@ END_DESC
       begin
         Mailer.deliver_test_email(user)
         puts l(:notice_email_sent, user.mail)
-      rescue Exception => e
+      rescue => e
         abort l(:notice_email_error, e.message)
       end
     end

lib/tasks/locales.rake

@@ -168,12 +168,12 @@ END_DESC
         puts "parsing #{filename}..."
         begin
           parser.parse File.open(filename)
-        rescue Exception => e1
+        rescue => e1
           puts(e1.message)
           puts("")
         end
       end
-    rescue Exception => e
+    rescue => e
       puts(e.message)
     end
   end

lib/tasks/migrate_from_trac.rake

@@ -614,7 +614,7 @@ namespace :redmine do
         raise "This directory doesn't exist!" unless File.directory?(path)
         raise "#{trac_attachments_directory} doesn't exist!" unless File.directory?(trac_attachments_directory)
         @@trac_directory
-      rescue Exception => e
+      rescue => e
         puts e
         return false
       end
@@ -629,7 +629,7 @@ namespace :redmine do
         # If adapter is sqlite or sqlite3, make sure that trac.db exists
         raise "#{trac_db_path} doesn't exist!" if %w(sqlite3).include?(adapter) && !File.exist?(trac_db_path)
         @@trac_adapter = adapter
-      rescue Exception => e
+      rescue => e
         puts e
         return false
       end

test/functional/admin_controller_test.rb

@@ -75,7 +75,7 @@ def test_load_default_configuration_data
 
   def test_load_default_configuration_data_should_rescue_error
     delete_configuration_data
-    Redmine::DefaultData::Loader.stubs(:load).raises(Exception.new("Something went wrong"))
+    Redmine::DefaultData::Loader.stubs(:load).raises(StandardError.new("Something went wrong"))
     post :default_configuration, :params => {
         :lang => 'fr'
       }
@@ -99,7 +99,7 @@ def test_test_email
   end
 
   def test_test_email_failure_should_display_the_error
-    Mailer.stubs(:test_email).raises(Exception, 'Some error message')
+    Mailer.stubs(:test_email).raises(StandardError, 'Some error message')
     post :test_email
     assert_redirected_to '/settings?tab=notifications'
     assert_match /Some error message/, flash[:error]

test/test_helper.rb

@@ -121,7 +121,7 @@ def with_locale(locale, &block)
   def self.ldap_configured?
     @test_ldap = Net::LDAP.new(:host => $redmine_test_ldap_server, :port => 389)
     return @test_ldap.bind
-  rescue Exception => e
+  rescue => e
     # LDAP is not listening
     return nil
   end

test/unit/issue_nested_set_concurrency_test.rb

@@ -84,7 +84,7 @@ def threaded(count, &block)
           ActiveRecord::Base.connection_pool.with_connection do
             begin
               yield
-            rescue Exception => e
+            rescue => e
               Thread.current[:exception] = e.message
             end
           end

test/unit/mail_handler_test.rb

@@ -1223,7 +1223,7 @@ def test_extract_options_from_env_should_return_options
   end
 
   def test_safe_receive_should_rescue_exceptions_and_return_false
-    MailHandler.stubs(:receive).raises(Exception.new "Something went wrong")
+    MailHandler.stubs(:receive).raises(StandardError.new "Something went wrong")
 
     assert_equal false, MailHandler.safe_receive
   end

test/unit/mailer_test.rb

@@ -920,10 +920,10 @@ def test_should_escape_html_templates_only
 
   def test_should_raise_delivery_errors_when_raise_delivery_errors_is_true
     mail = Mailer.test_email(User.find(1))
-    mail.delivery_method.stubs(:deliver!).raises(Exception.new("delivery error"))
+    mail.delivery_method.stubs(:deliver!).raises(StandardError.new("delivery error"))
 
     ActionMailer::Base.raise_delivery_errors = true
-    assert_raise Exception, "delivery error" do
+    assert_raise StandardError, "delivery error" do
       mail.deliver
     end
   ensure
@@ -932,7 +932,7 @@ def test_should_raise_delivery_errors_when_raise_delivery_errors_is_true
 
   def test_should_log_delivery_errors_when_raise_delivery_errors_is_false
     mail = Mailer.test_email(User.find(1))
-    mail.delivery_method.stubs(:deliver!).raises(Exception.new("delivery error"))
+    mail.delivery_method.stubs(:deliver!).raises(StandardError.new("delivery error"))
 
     Rails.logger.expects(:error).with("Email delivery error: delivery error")
     ActionMailer::Base.raise_delivery_errors = false

test/unit/project_nested_set_concurrency_test.rb

@@ -52,7 +52,7 @@ def test_concurrency
                 c2.reload.destroy
                 c1.reload.destroy
               end
-            rescue Exception => e
+            rescue => e
               Thread.current[:exception] = e.message
             end
           end

test/unit/tracker_test.rb

@@ -129,7 +129,7 @@ def test_destroying_a_tracker_with_issues_should_raise_an_error
     tracker = Tracker.find(1)
 
     assert_no_difference 'Tracker.count' do
-      assert_raise Exception do
+      assert_raise StandardError do
         tracker.destroy
       end
     end