summaryrefslogtreecommitdiff
path: root/app/services
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-07-06 13:09:02 +0000
committerRémy Coutable <remy@rymai.me>2016-07-06 13:09:02 +0000
commitb73da89591877e03ba9be7c415e30c3f07997373 (patch)
treee7cf068de74d0604c5ce34de74e088c1af5d26fa /app/services
parentcfd5870b62e9d76e564ffc64db1d1281b4a363bb (diff)
parent09452715d341268898308d996e8a5f4ce20feb72 (diff)
downloadgitlab-ce-b73da89591877e03ba9be7c415e30c3f07997373.tar.gz
Merge branch 'fix/project-export-error' into 'master'
Add more debug info to import/export and memory killer This should help debug https://gitlab.com/gitlab-org/gitlab-ce/issues/19124 further See merge request !5108
Diffstat (limited to 'app/services')
-rw-r--r--app/services/projects/import_export/export_service.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/services/projects/import_export/export_service.rb b/app/services/projects/import_export/export_service.rb
index 3f507d5c400..6afc048576d 100644
--- a/app/services/projects/import_export/export_service.rb
+++ b/app/services/projects/import_export/export_service.rb
@@ -38,6 +38,8 @@ module Projects
end
def cleanup_and_notify
+ Rails.logger.error("Import/Export - Project #{project.name} with ID: #{project.id} export error - #{@shared.errors.join(', ')}")
+
FileUtils.rm_rf(@shared.export_path)
notify_error
@@ -45,6 +47,8 @@ module Projects
end
def notify_success
+ Rails.logger.info("Import/Export - Project #{project.name} with ID: #{project.id} successfully exported")
+
notification_service.project_exported(@project, @current_user)
end