Commit 562fbed3 authored by Gabriel Mazetto's avatar Gabriel Mazetto

Change `path_with_namespace` to `full_path` and other codestyle fixes

parent 3c0a94a0
class Geo::DeletedProject < ::Project class Geo::DeletedProject < ::Project
after_initialize :readonly! after_initialize :readonly!
attr_reader :path_with_namespace attr_reader :full_path
def initialize(id:, name:, path_with_namespace:, repository_storage:) def initialize(id:, name:, full_path:, repository_storage:)
repository_storage = current_application_settings.pick_repository_storage unless repository_storage repository_storage ||= current_application_settings.pick_repository_storage
super(id: id, name: name, repository_storage: repository_storage) super(id: id, name: name, repository_storage: repository_storage)
@path_with_namespace = path_with_namespace @full_path = full_path
end end
def repository def repository
@repository ||= Repository.new(path_with_namespace, self) @repository ||= Repository.new(full_path, self)
end end
end end
class GeoRepositoryDestroyWorker class GeoRepositoryDestroyWorker
include Sidekiq::Worker include Sidekiq::Worker
include GeoQueue include GeoQueue
include Gitlab::ShellAdapter
def perform(id, name, path_with_namespace) def perform(id, name, full_path)
repository_storage = probe_repository_storage(path_with_namespace) repository_storage = probe_repository_storage(full_path)
# We don't have access to the original model anymore, so we are # We don't have access to the original model anymore, so we are
# rebuilding only what our service class requires # 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 ::Projects::DestroyService.new(project, nil).geo_replicate
end end
...@@ -20,11 +21,9 @@ class GeoRepositoryDestroyWorker ...@@ -20,11 +21,9 @@ class GeoRepositoryDestroyWorker
# we need to probe on all existing ones. # we need to probe on all existing ones.
# #
# if we don't find it means it has already been deleted and we just return # if we don't find it means it has already been deleted and we just return
def probe_repository_storage(path_with_namespace) def probe_repository_storage(full_path)
gitlab_shell = Gitlab::Shell.new
Gitlab.config.repositories.storages.each do |repository_storage, rs_data| 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 end
nil nil
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment