summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGabriel Mazetto <brodock@gmail.com>2017-11-21 00:23:43 +0100
committerGabriel Mazetto <brodock@gmail.com>2017-11-23 14:19:36 +0100
commit9fd31eb469de5099f7a7b44840d7930bc3c42bbe (patch)
treea634ff9876e04d1ec088147f92171a753e1350cb /app
parentf0f6a237d7e95fcc5d52e85aef151f0327bf2fdc (diff)
downloadgitlab-ce-9fd31eb469de5099f7a7b44840d7930bc3c42bbe.tar.gz
Raises error when migration cannot happen so job is cancelled
Diffstat (limited to 'app')
-rw-r--r--app/services/projects/hashed_storage/migrate_attachments_service.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/projects/hashed_storage/migrate_attachments_service.rb b/app/services/projects/hashed_storage/migrate_attachments_service.rb
index 68b9a72661c..26026899ebe 100644
--- a/app/services/projects/hashed_storage/migrate_attachments_service.rb
+++ b/app/services/projects/hashed_storage/migrate_attachments_service.rb
@@ -1,5 +1,7 @@
module Projects
module HashedStorage
+ AttachmentMigrationError = Class.new(StandardError)
+
class MigrateAttachmentsService < BaseService
attr_reader :logger
@@ -27,7 +29,7 @@ module Projects
if File.exist?(new_path)
logger.error("Cannot migrate attachments from '#{old_path}' to '#{new_path}', target path already exist (PROJECT_ID=#{project.id})")
- return
+ raise AttachmentMigrationError, "Target path '#{new_path}' already exist"
end
# Create hashed storage base path folder