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:
authorGabriel Mazetto <brodock@gmail.com>2017-06-22 04:51:36 +0300
committerGabriel Mazetto <brodock@gmail.com>2017-06-22 16:16:55 +0300
commit562fbed390e4fe736ddf452ce2a2856b2f2dc077 (patch)
tree33588781ab97ff910f2dd838e460c8394fed73e9 /app/workers
parent3c0a94a0e25c75d0bbbd8ebb55295d9ebe69fb6e (diff)
Change `path_with_namespace` to `full_path` and other codestyle fixes
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/geo_repository_destroy_worker.rb13
1 files changed, 6 insertions, 7 deletions
diff --git a/app/workers/geo_repository_destroy_worker.rb b/app/workers/geo_repository_destroy_worker.rb
index 7a0049eb7e2..dbd80358450 100644
--- a/app/workers/geo_repository_destroy_worker.rb
+++ b/app/workers/geo_repository_destroy_worker.rb
@@ -1,13 +1,14 @@
class GeoRepositoryDestroyWorker
include Sidekiq::Worker
include GeoQueue
+ include Gitlab::ShellAdapter
- def perform(id, name, path_with_namespace)
- repository_storage = probe_repository_storage(path_with_namespace)
+ def perform(id, name, full_path)
+ repository_storage = probe_repository_storage(full_path)
# We don't have access to the original model anymore, so we are
# rebuilding only what our service class requires
- project = ::Geo::DeletedProject.new(id: id, name: name, path_with_namespace: path_with_namespace, repository_storage: repository_storage)
+ project = ::Geo::DeletedProject.new(id: id, name: name, full_path: full_path, repository_storage: repository_storage)
::Projects::DestroyService.new(project, nil).geo_replicate
end
@@ -20,11 +21,9 @@ class GeoRepositoryDestroyWorker
# we need to probe on all existing ones.
#
# if we don't find it means it has already been deleted and we just return
- def probe_repository_storage(path_with_namespace)
- gitlab_shell = Gitlab::Shell.new
-
+ def probe_repository_storage(full_path)
Gitlab.config.repositories.storages.each do |repository_storage, rs_data|
- return repository_storage if gitlab_shell.exists?(rs_data['path'], path_with_namespace + '.git')
+ return repository_storage if gitlab_shell.exists?(rs_data['path'], full_path + '.git')
end
nil