Merge branch 'rs-archive-cache-worker-cron' into 'master'

Move RepositoryArchiveCacheWorker to sidekiq-cron

Closes #15105

See merge request !3663
This commit is contained in:
Dmitriy Zaporozhets 2016-04-13 12:53:01 +00:00
commit ab4ea3720c
4 changed files with 6 additions and 2 deletions

View file

@ -11,7 +11,6 @@ class Projects::RepositoriesController < Projects::ApplicationController
end
def archive
RepositoryArchiveCacheWorker.perform_async
headers.store(*Gitlab::Workhorse.send_git_archive(@project, params[:ref], params[:format]))
head :ok
rescue => ex

View file

@ -165,6 +165,9 @@ production: &base
stuck_ci_builds_worker:
cron: "0 0 * * *"
# Remove outdated repository archives
repository_archive_cache_worker:
cron: "0 * * * *"
#
# 2. GitLab CI settings

View file

@ -240,6 +240,9 @@ Settings['cron_jobs'] ||= Settingslogic.new({})
Settings.cron_jobs['stuck_ci_builds_worker'] ||= Settingslogic.new({})
Settings.cron_jobs['stuck_ci_builds_worker']['cron'] ||= '0 0 * * *'
Settings.cron_jobs['stuck_ci_builds_worker']['job_class'] = 'StuckCiBuildsWorker'
Settings.cron_jobs['repository_archive_cache_worker'] ||= Settingslogic.new({})
Settings.cron_jobs['repository_archive_cache_worker']['cron'] ||= '0 * * * *'
Settings.cron_jobs['repository_archive_cache_worker']['job_class'] = 'RepositoryArchiveCacheWorker'
#

View file

@ -98,7 +98,6 @@ module API
authorize! :download_code, user_project
begin
RepositoryArchiveCacheWorker.perform_async
header *Gitlab::Workhorse.send_git_archive(user_project, params[:sha], params[:format])
rescue
not_found!('File')