Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

ensure all temporary images are being deleted, regardless of pdf render exceptions

as-opbac9c1b5aa67
diff --git a/app/models/projects/exports/pdf.rb b/app/models/projects/exports/pdf.rb
index 06fcf08b59e..3168ea542a8 100644
--- a/app/models/projects/exports/pdf.rb
+++ b/app/models/projects/exports/pdf.rb
@@ -116,9 +116,10 @@ module Projects::Exports
file = Tempfile.new(filename)
pdf.render_file(file.path)
@page_count += pdf.page_count
- delete_all_resized_images
file.close
file
+ ensure
+ delete_all_resized_images
end
def write_after_pages!
diff --git a/app/models/work_package/pdf_export/document_generator.rb b/app/models/work_package/pdf_export/document_generator.rb
index 81f7bf25961..9be73a9d7e3 100644
--- a/app/models/work_package/pdf_export/document_generator.rb
+++ b/app/models/work_package/pdf_export/document_generator.rb
@@ -61,6 +61,8 @@ class WorkPackage::PDFExport::DocumentGenerator < Exports::Exporter
rescue StandardError => e
Rails.logger.error "Failed to generate PDF export: #{e.message}:\n#{e.backtrace.join("\n")}"
error(I18n.t(:error_pdf_failed_to_export, error: e.message))
+ ensure
+ delete_all_resized_images
end
def render_doc
diff --git a/app/models/work_package/pdf_export/work_package_list_to_pdf.rb b/app/models/work_package/pdf_export/work_package_list_to_pdf.rb
index a6c64d066aa..cc727755572 100644
--- a/app/models/work_package/pdf_export/work_package_list_to_pdf.rb
+++ b/app/models/work_package/pdf_export/work_package_list_to_pdf.rb
@@ -214,9 +214,10 @@ class WorkPackage::PDFExport::WorkPackageListToPdf < WorkPackage::Exports::Query
file = Tempfile.new(filename)
pdf.render_file(file.path)
@page_count += pdf.page_count
- delete_all_resized_images
file.close
file
+ ensure
+ delete_all_resized_images
end
def write_after_pages!
diff --git a/app/models/work_package/pdf_export/work_package_to_pdf.rb b/app/models/work_package/pdf_export/work_package_to_pdf.rb
index 2be9acc66f6..b51f0c5d485 100644
--- a/app/models/work_package/pdf_export/work_package_to_pdf.rb
+++ b/app/models/work_package/pdf_export/work_package_to_pdf.rb
@@ -61,6 +61,8 @@ class WorkPackage::PDFExport::WorkPackageToPdf < Exports::Exporter
rescue StandardError => e
Rails.logger.error "Failed to generate PDF export: #{e.message}:\n#{e.backtrace.join("\n")}"
error(I18n.t(:error_pdf_failed_to_export, error: e.message))
+ ensure
+ delete_all_resized_images
end
def setup_page!
diff --git a/modules/meeting/app/workers/meetings/pdf/common/exporter.rb b/modules/meeting/app/workers/meetings/pdf/common/exporter.rb
index 384401a957f..df0dc2e28f4 100644
--- a/modules/meeting/app/workers/meetings/pdf/common/exporter.rb
+++ b/modules/meeting/app/workers/meetings/pdf/common/exporter.rb
@@ -61,6 +61,8 @@ module Meetings::PDF::Common
rescue StandardError => e
Rails.logger.error "Failed to generate PDF export: #{e.message}:\n#{e.backtrace.join("\n")}"
error(I18n.t(:error_pdf_failed_to_export, error: e.message))
+ ensure
+ delete_all_resized_images
end
def setup_page!