Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-05-10 18:15:20 +0300
committerJames Lopez <james@jameslopez.es>2016-05-10 18:15:20 +0300
commita5d59f075a4a9a301ef985eb7cc6cdfdf3e73955 (patch)
tree4ba912caf343c7a1d0fd77894f368a400065aec5 /app/services/projects
parent6a12ff6345e517af9cf07cb61f3a0ea85562f399 (diff)
added better error handling. Also refactored some of the code and fixed a few issues in project_tree_saver
Diffstat (limited to 'app/services/projects')
-rw-r--r--app/services/projects/import_export/export_service.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/services/projects/import_export/export_service.rb b/app/services/projects/import_export/export_service.rb
index fd569e1c9ae..87a259ed15a 100644
--- a/app/services/projects/import_export/export_service.rb
+++ b/app/services/projects/import_export/export_service.rb
@@ -4,8 +4,8 @@ module Projects
def execute(options = {})
@shared = Gitlab::ImportExport::Shared.new(relative_path: File.join(project.path_with_namespace, 'work'))
- # TODO handle errors
save_all if [save_project_tree, bundle_repo, bundle_wiki_repo].all?
+ notify_worker if @shared.errors.any?
end
private
@@ -23,7 +23,11 @@ module Projects
end
def save_all
- Gitlab::ImportExport::Saver.save(storage_path: @shared.export_path)
+ Gitlab::ImportExport::Saver.save(shared: @shared)
+ end
+
+ def notify_worker
+ raise Gitlab::ImportExport::Error @shared.errors.join(', ')
end
end
end