This commit is contained in:
Karel Pičman 2023-06-01 13:44:55 +02:00
parent dc0906b4b3
commit 377dd56f14
13 changed files with 22 additions and 22 deletions

View File

@ -500,7 +500,7 @@ class DmsfController < ApplicationController
begin begin
DmsfMailer.deliver_files_downloaded(@project, zip.files, request.remote_ip) DmsfMailer.deliver_files_downloaded(@project, zip.files, request.remote_ip)
rescue StandardError => e rescue StandardError => e
Rails.logger.error { "Could not send email notifications: #{e.message}" } Rails.logger.error "Could not send email notifications: #{e.message}"
end end
@email_params = { @email_params = {
@ -535,7 +535,7 @@ class DmsfController < ApplicationController
begin begin
DmsfMailer.deliver_files_downloaded(@project, zip.files, request.remote_ip) DmsfMailer.deliver_files_downloaded(@project, zip.files, request.remote_ip)
rescue StandardError => e rescue StandardError => e
Rails.logger.error { "Could not send email notifications: #{e.message}" } Rails.logger.error "Could not send email notifications: #{e.message}"
end end
send_file( send_file(
zip.finish, zip.finish,
@ -640,7 +640,7 @@ class DmsfController < ApplicationController
end end
end end
rescue StandardError => e rescue StandardError => e
Rails.logger.error { "Could not send email notifications: #{e.message}" } Rails.logger.error "Could not send email notifications: #{e.message}"
end end
end end
unless not_deleted_files.empty? unless not_deleted_files.empty?

View File

@ -66,7 +66,7 @@ class DmsfFilesController < ApplicationController
begin begin
DmsfMailer.deliver_files_downloaded @project, [@file], request.remote_ip DmsfMailer.deliver_files_downloaded @project, [@file], request.remote_ip
rescue StandardError => e rescue StandardError => e
Rails.logger.error { "Could not send email notifications: #{e.message}" } Rails.logger.error "Could not send email notifications: #{e.message}"
end end
# Allow a preview of the file by an external plugin # Allow a preview of the file by an external plugin
results = call_hook(:dmsf_files_controller_before_view, { file: @revision.disk_file }) results = call_hook(:dmsf_files_controller_before_view, { file: @revision.disk_file })

View File

@ -467,7 +467,7 @@ class DmsfWorkflowsController < ApplicationController
next if step.save next if step.save
flash[:error] = step.errors.full_messages.to_sentence flash[:error] = step.errors.full_messages.to_sentence
Rails.logger.error { step.errors.full_messages.to_sentence } Rails.logger.error step.errors.full_messages.to_sentence
end end
end end
redirect_to dmsf_workflow_path(@dmsf_workflow) redirect_to dmsf_workflow_path(@dmsf_workflow)

View File

@ -84,12 +84,12 @@ module DmsfUploadHelper
# Need to save file first to generate id for it in case of creation. # Need to save file first to generate id for it in case of creation.
# File id is needed to properly generate revision disk filename # File id is needed to properly generate revision disk filename
unless new_revision.valid? unless new_revision.valid?
Rails.logger.error { new_revision.errors.full_messages.to_sentence } Rails.logger.error new_revision.errors.full_messages.to_sentence
failed_uploads.push new_revision failed_uploads.push new_revision
next next
end end
unless file.save unless file.save
Rails.logger.error { file.errors.full_messages.to_sentence } Rails.logger.error file.errors.full_messages.to_sentence
failed_uploads.push file failed_uploads.push file
next next
end end
@ -132,7 +132,7 @@ module DmsfUploadHelper
Rails.logger.warn e.message Rails.logger.warn e.message
end end
else else
Rails.logger.error { l(:error_workflow_assign) } Rails.logger.error l(:error_workflow_assign)
end end
end end
# Notifications # Notifications
@ -147,7 +147,7 @@ module DmsfUploadHelper
end end
end end
rescue StandardError => e rescue StandardError => e
Rails.logger.error { "Could not send email notifications: #{e.message}" } Rails.logger.error "Could not send email notifications: #{e.message}"
end end
end end
if failed_uploads.present? && controller if failed_uploads.present? && controller

View File

@ -164,7 +164,7 @@ class DmsfFile < ApplicationRecord
save save
end end
rescue StandardError => e rescue StandardError => e
Rails.logger.error { e.message } Rails.logger.error e.message
errors.add :base, e.message errors.add :base, e.message
false false
end end
@ -251,7 +251,7 @@ class DmsfFile < ApplicationRecord
def move_to(project, folder) def move_to(project, folder)
unless last_revision unless last_revision
errors.add :base, l(:error_at_least_one_revision_must_be_present) errors.add :base, l(:error_at_least_one_revision_must_be_present)
Rails.logger.error { l(:error_at_least_one_revision_must_be_present) } Rails.logger.error l(:error_at_least_one_revision_must_be_present)
return false return false
end end
source = "#{self.project.identifier}:#{dmsf_path_str}" source = "#{self.project.identifier}:#{dmsf_path_str}"
@ -324,12 +324,12 @@ class DmsfFile < ApplicationRecord
file.last_revision = new_revision file.last_revision = new_revision
else else
errors.add :base, new_revision.errors.full_messages.to_sentence errors.add :base, new_revision.errors.full_messages.to_sentence
Rails.logger.error { new_revision.errors.full_messages.to_sentence } Rails.logger.error new_revision.errors.full_messages.to_sentence
file.delete commit: true file.delete commit: true
file = nil file = nil
end end
else else
Rails.logger.error { file.errors.full_messages.to_sentence } Rails.logger.error file.errors.full_messages.to_sentence
file.delete commit: true file.delete commit: true
file = nil file = nil
end end
@ -373,7 +373,7 @@ class DmsfFile < ApplicationRecord
databasepath = File.join(Setting.plugin_redmine_dmsf['dmsf_index_database'].strip, lang) databasepath = File.join(Setting.plugin_redmine_dmsf['dmsf_index_database'].strip, lang)
database = Xapian::Database.new(databasepath) database = Xapian::Database.new(databasepath)
rescue StandardError => e rescue StandardError => e
Rails.logger.error { "REDMINE_XAPIAN ERROR: Xapian database is not properly set, initiated or it's corrupted." } Rails.logger.error "REDMINE_XAPIAN ERROR: Xapian database is not properly set, initiated or it's corrupted."
Rails.logger.error e.message Rails.logger.error e.message
end end

View File

@ -310,7 +310,7 @@ class DmsfFolder < ApplicationRecord
new_folder.custom_values << v new_folder.custom_values << v
end end
unless new_folder.save unless new_folder.save
Rails.logger.error { new_folder.errors.full_messages.to_sentence } Rails.logger.error new_folder.errors.full_messages.to_sentence
return new_folder return new_folder
end end
if copy_files if copy_files

View File

@ -115,7 +115,7 @@ class DmsfMailer < Mailer
zipped_content_data = File.binread(email_params[:zipped_content]) zipped_content_data = File.binread(email_params[:zipped_content])
attachments['Documents.zip'] = { content_type: 'application/zip', content: zipped_content_data } attachments['Documents.zip'] = { content_type: 'application/zip', content: zipped_content_data }
else else
Rails.logger.error { "Cannot attach #{email_params[:zipped_content]}, it doesn't exist." } Rails.logger.error "Cannot attach #{email_params[:zipped_content]}, it doesn't exist."
end end
end end
skip_no_self_notified = false skip_no_self_notified = false

View File

@ -43,7 +43,7 @@ class DmsfUpload
} }
DmsfUpload.new project, folder, uploaded DmsfUpload.new project, folder, uploaded
else else
Rails.logger.error { "An attachment not found by its token: #{uploaded_file[:token]}" } Rails.logger.error "An attachment not found by its token: #{uploaded_file[:token]}"
nil nil
end end
end end

View File

@ -45,7 +45,7 @@ module Dav4rack
response.finish response.finish
rescue StandardError => e rescue StandardError => e
Rails.logger.error { "WebDAV Error: #{e.message}" } Rails.logger.error "WebDAV Error: #{e.message}"
raise e raise e
end end

View File

@ -78,7 +78,7 @@ module RedmineDmsf
Rails.logger.warn e.message Rails.logger.warn e.message
end end
else else
Rails.logger.error { l(:error_workflow_assign) } Rails.logger.error l(:error_workflow_assign)
end end
end end
copied_from = EasyCrmCase.find_by(id: params[:copy_from]) if params[:copy_from].present? copied_from = EasyCrmCase.find_by(id: params[:copy_from]) if params[:copy_from].present?

View File

@ -52,7 +52,7 @@ module RedmineDmsf
if system(cmd) if system(cmd)
target target
else else
Rails.logger.error { "Creating preview failed (#{$CHILD_STATUS}):\nCommand: #{cmd}" } Rails.logger.error "Creating preview failed (#{$CHILD_STATUS}):\nCommand: #{cmd}"
'' ''
end end
end end

View File

@ -242,7 +242,7 @@ module RedmineDmsf
@file = DmsfFile.find_file_by_name(@project, @folder, pinfo.first) @file = DmsfFile.find_file_by_name(@project, @folder, pinfo.first)
@folder = nil @folder = nil
unless pinfo.length < 2 || @file unless pinfo.length < 2 || @file
Rails.logger.error { "Resource not found: #{@path}" } Rails.logger.error "Resource not found: #{@path}"
raise Conflict raise Conflict
end end
break # We're at the end break # We're at the end

View File

@ -722,7 +722,7 @@ module RedmineDmsf
begin begin
DmsfMailer.deliver_files_downloaded(@project, [file], @request.env['REMOTE_IP']) DmsfMailer.deliver_files_downloaded(@project, [file], @request.env['REMOTE_IP'])
rescue StandardError => e rescue StandardError => e
Rails.logger.error { "Could not send email notifications: #{e.message}" } Rails.logger.error "Could not send email notifications: #{e.message}"
end end
end end
File.new disk_file File.new disk_file