From cffae0d22ee159b78f66eb68cae9df4bcb9e83e5 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Wed, 11 May 2016 14:51:25 +0200
Subject: [PATCH] fixing more export problems

---
 app/services/projects/import_export/export_service.rb |  2 +-
 app/workers/project_export_worker.rb                  |  3 +--
 lib/gitlab/import_export/saver.rb                     | 10 +++++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/services/projects/import_export/export_service.rb b/app/services/projects/import_export/export_service.rb
index 87a259ed15..e6eb6f915b 100644
--- a/app/services/projects/import_export/export_service.rb
+++ b/app/services/projects/import_export/export_service.rb
@@ -27,7 +27,7 @@ module Projects
       end
 
       def notify_worker
-        raise Gitlab::ImportExport::Error @shared.errors.join(', ')
+        raise Gitlab::ImportExport::Error.new(@shared.errors.join(', '))
       end
     end
   end
diff --git a/app/workers/project_export_worker.rb b/app/workers/project_export_worker.rb
index a1add5395b..3616b37d2a 100644
--- a/app/workers/project_export_worker.rb
+++ b/app/workers/project_export_worker.rb
@@ -1,13 +1,12 @@
 class ProjectExportWorker
   include Sidekiq::Worker
 
-  # TODO: enabled retry - disabled for QA purposes
+  # TODO: enable retry - disabled for QA purposes
   sidekiq_options queue: :gitlab_shell, retry: false
 
   def perform(current_user_id, project_id)
     current_user = User.find(current_user_id)
     project = Project.find(project_id)
     ::Projects::ImportExport::ExportService.new(project, current_user).execute
-    # TODO : Handle errors
   end
 end
diff --git a/lib/gitlab/import_export/saver.rb b/lib/gitlab/import_export/saver.rb
index 7532c977fc..a2ff43a3ce 100644
--- a/lib/gitlab/import_export/saver.rb
+++ b/lib/gitlab/import_export/saver.rb
@@ -13,7 +13,7 @@ module Gitlab
 
       def save
         if compress_and_save
-          remove_storage_path
+          remove_export_path
           Rails.logger.info("Saved project export #{archive_file}")
           archive_file
         else
@@ -27,15 +27,15 @@ module Gitlab
       private
 
       def compress_and_save
-        tar_czf(archive: archive_file, dir: @shared.storage_path)
+        tar_czf(archive: archive_file, dir: @shared.export_path)
       end
 
-      def remove_storage_path
-        FileUtils.rm_rf(@shared.storage_path)
+      def remove_export_path
+        FileUtils.rm_rf(@shared.export_path)
       end
 
       def archive_file
-        @archive_file ||= File.join(@shared.storage_path, '..', "#{Time.now.strftime('%Y-%m-%d_%H-%M-%3N')}_project_export.tar.gz")
+        @archive_file ||= File.join(@shared.export_path, '..', "#{Time.now.strftime('%Y-%m-%d_%H-%M-%3N')}_project_export.tar.gz")
       end
     end
   end