Commit ccc01b36 authored by Douwe Maan's avatar Douwe Maan

Small code cleanup.

parent e7bbd85b
...@@ -3,7 +3,7 @@ class ArchiveRepositoryService ...@@ -3,7 +3,7 @@ class ArchiveRepositoryService
def initialize(project, ref, format) def initialize(project, ref, format)
format ||= 'tar.gz' format ||= 'tar.gz'
@project, @ref, @format = project, ref, format @project, @ref, @format = project, ref, format.downcase
end end
def execute def execute
...@@ -28,16 +28,12 @@ class ArchiveRepositoryService ...@@ -28,16 +28,12 @@ class ArchiveRepositoryService
Gitlab.config.gitlab.repository_downloads_path Gitlab.config.gitlab.repository_downloads_path
end end
def archive_args
@archive_args ||= [ref, storage_path, format.downcase]
end
def file_path def file_path
@file_path ||= project.repository.archive_file_path(*archive_args) @file_path ||= project.repository.archive_file_path(ref, storage_path, format)
end end
def pid_file_path def pid_file_path
@pid_file_path ||= project.repository.archive_pid_file_path(*archive_args) @pid_file_path ||= project.repository.archive_pid_file_path(ref, storage_path, format)
end end
def archived? def archived?
...@@ -48,8 +44,7 @@ class ArchiveRepositoryService ...@@ -48,8 +44,7 @@ class ArchiveRepositoryService
File.exist?(pid_file_path) File.exist?(pid_file_path)
end end
def wait_until_archived def wait_until_archived(timeout = 5.0)
timeout = 5.0
t1 = Time.now t1 = Time.now
begin begin
......
...@@ -7,7 +7,7 @@ class RepositoryArchiveWorker ...@@ -7,7 +7,7 @@ class RepositoryArchiveWorker
def perform(project_id, ref, format) def perform(project_id, ref, format)
@project = Project.find(project_id) @project = Project.find(project_id)
@ref, @format = ref, format @ref, @format = ref, format.downcase
repository = project.repository repository = project.repository
...@@ -15,7 +15,7 @@ class RepositoryArchiveWorker ...@@ -15,7 +15,7 @@ class RepositoryArchiveWorker
return if archived? || archiving? return if archived? || archiving?
repository.archive_repo(*archive_args) repository.archive_repo(ref, storage_path, format)
end end
private private
...@@ -24,16 +24,12 @@ class RepositoryArchiveWorker ...@@ -24,16 +24,12 @@ class RepositoryArchiveWorker
Gitlab.config.gitlab.repository_downloads_path Gitlab.config.gitlab.repository_downloads_path
end end
def archive_args
@archive_args ||= [ref, storage_path, format.downcase]
end
def file_path def file_path
@file_path ||= project.repository.archive_file_path(*archive_args) @file_path ||= project.repository.archive_file_path(ref, storage_path, format)
end end
def pid_file_path def pid_file_path
@pid_file_path ||= project.repository.archive_pid_file_path(*archive_args) @pid_file_path ||= project.repository.archive_pid_file_path(ref, storage_path, format)
end end
def archived? def archived?
......
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