Small code cleanup.

2 files changed, 8 insertions, 17 deletions

diff --git a/app/services/archive_repository_service.rb b/app/services/archive_repository_service.rb
index cb2026fedba..40b0a64fb73 100644
--- a/app/services/archive_repository_service.rb
+++ b/app/services/archive_repository_service.rb
@@ -3,7 +3,7 @@ class ArchiveRepositoryService
 
   def initialize(project, ref, format)
     format ||= 'tar.gz'
-    @project, @ref, @format = project, ref, format
+    @project, @ref, @format = project, ref, format.downcase
   end
 
   def execute
@@ -28,16 +28,12 @@ class ArchiveRepositoryService
     Gitlab.config.gitlab.repository_downloads_path
   end
 
-  def archive_args
-    @archive_args ||= [ref, storage_path, format.downcase]
-  end
-
   def file_path
-    @file_path ||= project.repository.archive_file_path(*archive_args)
+    @file_path ||= project.repository.archive_file_path(ref, storage_path, format)
   end
 
   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
 
   def archived?
@@ -48,8 +44,7 @@ class ArchiveRepositoryService
     File.exist?(pid_file_path)
   end
 
-  def wait_until_archived
-    timeout = 5.0
+  def wait_until_archived(timeout = 5.0)
     t1 = Time.now
 
     begin
diff --git a/app/workers/repository_archive_worker.rb b/app/workers/repository_archive_worker.rb
index 3f4681a80f4..42ac77c588e 100644
--- a/app/workers/repository_archive_worker.rb
+++ b/app/workers/repository_archive_worker.rb
@@ -7,7 +7,7 @@ class RepositoryArchiveWorker
 
   def perform(project_id, ref, format)
     @project = Project.find(project_id)
-    @ref, @format = ref, format
+    @ref, @format = ref, format.downcase
 
     repository = project.repository
 
@@ -15,7 +15,7 @@ class RepositoryArchiveWorker
 
     return if archived? || archiving?
 
-    repository.archive_repo(*archive_args)
+    repository.archive_repo(ref, storage_path, format)
   end
 
   private
@@ -24,16 +24,12 @@ class RepositoryArchiveWorker
     Gitlab.config.gitlab.repository_downloads_path
   end
 
-  def archive_args
-    @archive_args ||= [ref, storage_path, format.downcase]
-  end
-
   def file_path
-    @file_path ||= project.repository.archive_file_path(*archive_args)
+    @file_path ||= project.repository.archive_file_path(ref, storage_path, format)
   end
 
   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
 
   def archived?