diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb
index 2701d06b..fc2dd48f 100644
--- a/app/controllers/dmsf_controller.rb
+++ b/app/controllers/dmsf_controller.rb
@@ -500,7 +500,7 @@ class DmsfController < ApplicationController
     begin
       DmsfMailer.deliver_files_downloaded(@project, zip.files, request.remote_ip)
     rescue StandardError => e
-      Rails.logger.error { "Could not send email notifications: #{e.message}" }
+      Rails.logger.error "Could not send email notifications: #{e.message}"
     end
 
     @email_params = {
@@ -535,7 +535,7 @@ class DmsfController < ApplicationController
     begin
       DmsfMailer.deliver_files_downloaded(@project, zip.files, request.remote_ip)
     rescue StandardError => e
-      Rails.logger.error { "Could not send email notifications: #{e.message}" }
+      Rails.logger.error "Could not send email notifications: #{e.message}"
     end
     send_file(
       zip.finish,
@@ -640,7 +640,7 @@ class DmsfController < ApplicationController
           end
         end
       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
     unless not_deleted_files.empty?
diff --git a/app/controllers/dmsf_files_controller.rb b/app/controllers/dmsf_files_controller.rb
index 476be18b..30235d3a 100644
--- a/app/controllers/dmsf_files_controller.rb
+++ b/app/controllers/dmsf_files_controller.rb
@@ -66,7 +66,7 @@ class DmsfFilesController < ApplicationController
     begin
       DmsfMailer.deliver_files_downloaded @project, [@file], request.remote_ip
     rescue StandardError => e
-      Rails.logger.error { "Could not send email notifications: #{e.message}" }
+      Rails.logger.error "Could not send email notifications: #{e.message}"
     end
     # Allow a preview of the file by an external plugin
     results = call_hook(:dmsf_files_controller_before_view, { file: @revision.disk_file })
diff --git a/app/controllers/dmsf_workflows_controller.rb b/app/controllers/dmsf_workflows_controller.rb
index b86ef700..ab083778 100644
--- a/app/controllers/dmsf_workflows_controller.rb
+++ b/app/controllers/dmsf_workflows_controller.rb
@@ -467,7 +467,7 @@ class DmsfWorkflowsController < ApplicationController
         next if step.save
 
         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
     redirect_to dmsf_workflow_path(@dmsf_workflow)
diff --git a/app/helpers/dmsf_upload_helper.rb b/app/helpers/dmsf_upload_helper.rb
index b7d90031..d47b4a75 100644
--- a/app/helpers/dmsf_upload_helper.rb
+++ b/app/helpers/dmsf_upload_helper.rb
@@ -84,12 +84,12 @@ module DmsfUploadHelper
         # Need to save file first to generate id for it in case of creation.
         # File id is needed to properly generate revision disk filename
         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
           next
         end
         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
           next
         end
@@ -132,7 +132,7 @@ module DmsfUploadHelper
             Rails.logger.warn e.message
           end
         else
-          Rails.logger.error { l(:error_workflow_assign) }
+          Rails.logger.error l(:error_workflow_assign)
         end
       end
       # Notifications
@@ -147,7 +147,7 @@ module DmsfUploadHelper
           end
         end
       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
     if failed_uploads.present? && controller
diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb
index 723a3554..14e7b351 100644
--- a/app/models/dmsf_file.rb
+++ b/app/models/dmsf_file.rb
@@ -164,7 +164,7 @@ class DmsfFile < ApplicationRecord
         save
       end
     rescue StandardError => e
-      Rails.logger.error { e.message }
+      Rails.logger.error e.message
       errors.add :base, e.message
       false
     end
@@ -251,7 +251,7 @@ class DmsfFile < ApplicationRecord
   def move_to(project, folder)
     unless last_revision
       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
     end
     source = "#{self.project.identifier}:#{dmsf_path_str}"
@@ -324,12 +324,12 @@ class DmsfFile < ApplicationRecord
         file.last_revision = new_revision
       else
         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 = nil
       end
     else
-      Rails.logger.error { file.errors.full_messages.to_sentence }
+      Rails.logger.error file.errors.full_messages.to_sentence
       file.delete commit: true
       file = nil
     end
@@ -373,7 +373,7 @@ class DmsfFile < ApplicationRecord
         databasepath = File.join(Setting.plugin_redmine_dmsf['dmsf_index_database'].strip, lang)
         database = Xapian::Database.new(databasepath)
       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
       end
 
diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb
index 96854be4..ee09beba 100644
--- a/app/models/dmsf_folder.rb
+++ b/app/models/dmsf_folder.rb
@@ -310,7 +310,7 @@ class DmsfFolder < ApplicationRecord
       new_folder.custom_values << v
     end
     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
     end
     if copy_files
diff --git a/app/models/dmsf_mailer.rb b/app/models/dmsf_mailer.rb
index b7e17b50..044c3f80 100644
--- a/app/models/dmsf_mailer.rb
+++ b/app/models/dmsf_mailer.rb
@@ -115,7 +115,7 @@ class DmsfMailer < Mailer
         zipped_content_data = File.binread(email_params[:zipped_content])
         attachments['Documents.zip'] = { content_type: 'application/zip', content: zipped_content_data }
       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
     skip_no_self_notified = false
diff --git a/app/models/dmsf_upload.rb b/app/models/dmsf_upload.rb
index cc797c40..66ba061b 100644
--- a/app/models/dmsf_upload.rb
+++ b/app/models/dmsf_upload.rb
@@ -43,7 +43,7 @@ class DmsfUpload
       }
       DmsfUpload.new project, folder, uploaded
     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
     end
   end
diff --git a/lib/dav4rack/handler.rb b/lib/dav4rack/handler.rb
index 237730ad..f38075a6 100644
--- a/lib/dav4rack/handler.rb
+++ b/lib/dav4rack/handler.rb
@@ -45,7 +45,7 @@ module Dav4rack
 
       response.finish
     rescue StandardError => e
-      Rails.logger.error { "WebDAV Error: #{e.message}" }
+      Rails.logger.error "WebDAV Error: #{e.message}"
       raise e
     end
 
diff --git a/lib/redmine_dmsf/patches/easy_crm_cases_controller_patch.rb b/lib/redmine_dmsf/patches/easy_crm_cases_controller_patch.rb
index d85cf664..685de91f 100644
--- a/lib/redmine_dmsf/patches/easy_crm_cases_controller_patch.rb
+++ b/lib/redmine_dmsf/patches/easy_crm_cases_controller_patch.rb
@@ -78,7 +78,7 @@ module RedmineDmsf
                 Rails.logger.warn e.message
               end
             else
-              Rails.logger.error { l(:error_workflow_assign) }
+              Rails.logger.error l(:error_workflow_assign)
             end
           end
           copied_from = EasyCrmCase.find_by(id: params[:copy_from]) if params[:copy_from].present?
diff --git a/lib/redmine_dmsf/preview.rb b/lib/redmine_dmsf/preview.rb
index 84b36185..f2e6b34f 100644
--- a/lib/redmine_dmsf/preview.rb
+++ b/lib/redmine_dmsf/preview.rb
@@ -52,7 +52,7 @@ module RedmineDmsf
       if system(cmd)
         target
       else
-        Rails.logger.error { "Creating preview failed (#{$CHILD_STATUS}):\nCommand: #{cmd}" }
+        Rails.logger.error "Creating preview failed (#{$CHILD_STATUS}):\nCommand: #{cmd}"
         ''
       end
     end
diff --git a/lib/redmine_dmsf/webdav/base_resource.rb b/lib/redmine_dmsf/webdav/base_resource.rb
index f18cbea8..ec5cfe12 100644
--- a/lib/redmine_dmsf/webdav/base_resource.rb
+++ b/lib/redmine_dmsf/webdav/base_resource.rb
@@ -242,7 +242,7 @@ module RedmineDmsf
               @file = DmsfFile.find_file_by_name(@project, @folder, pinfo.first)
               @folder = nil
               unless pinfo.length < 2 || @file
-                Rails.logger.error { "Resource not found: #{@path}" }
+                Rails.logger.error "Resource not found: #{@path}"
                 raise Conflict
               end
               break # We're at the end
diff --git a/lib/redmine_dmsf/webdav/dmsf_resource.rb b/lib/redmine_dmsf/webdav/dmsf_resource.rb
index 2c0b61cb..0fa22e64 100644
--- a/lib/redmine_dmsf/webdav/dmsf_resource.rb
+++ b/lib/redmine_dmsf/webdav/dmsf_resource.rb
@@ -722,7 +722,7 @@ module RedmineDmsf
           begin
             DmsfMailer.deliver_files_downloaded(@project, [file], @request.env['REMOTE_IP'])
           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
         File.new disk_file