diff --git a/app/controllers/dmsf_files_controller.rb b/app/controllers/dmsf_files_controller.rb index 2702a6ad..eb7feb17 100644 --- a/app/controllers/dmsf_files_controller.rb +++ b/app/controllers/dmsf_files_controller.rb @@ -153,8 +153,8 @@ class DmsfFilesController < ApplicationController revision.assign_workflow(params[:dmsf_workflow_id]) if upload begin - FileUtils.mv(upload.tempfile_path, revision.disk_file(false)) - rescue StandardError => e + FileUtils.mv upload.tempfile_path, revision.disk_file(false) + rescue => e Rails.logger.error e.message flash[:error] = e.message revision.destroy diff --git a/app/controllers/dmsf_workflows_controller.rb b/app/controllers/dmsf_workflows_controller.rb index 661329ca..ce3de218 100644 --- a/app/controllers/dmsf_workflows_controller.rb +++ b/app/controllers/dmsf_workflows_controller.rb @@ -208,7 +208,7 @@ class DmsfWorkflowsController < ApplicationController end end end - rescue StandardError => e + rescue => e flash[:errors] = e.message end redirect_to :back diff --git a/app/models/dmsf_file_revision.rb b/app/models/dmsf_file_revision.rb index bd17c8ac..1cdd06fa 100644 --- a/app/models/dmsf_file_revision.rb +++ b/app/models/dmsf_file_revision.rb @@ -174,7 +174,7 @@ class DmsfFileRevision < ActiveRecord::Base path = storage_base_path begin FileUtils.mkdir_p(path) unless File.exist?(path) - rescue StandardError => e + rescue => e Rails.logger.error e.message end filename = path.join(disk_filename)