Hotfix for sidekiq-cron being loaded from Settingslogic with defaults
This commit is contained in:
parent
347c1136c2
commit
a7a52f7567
|
@ -234,7 +234,7 @@ Settings.gravatar['host'] = Settings.get_host_without_www(Settings.grava
|
|||
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']['class'] = 'StuckCiBuildsWorker'
|
||||
Settings.cron_jobs['stuck_ci_builds_worker']['job_class'] = 'StuckCiBuildsWorker'
|
||||
|
||||
|
||||
#
|
||||
|
|
|
@ -19,7 +19,11 @@ Sidekiq.configure_server do |config|
|
|||
end
|
||||
|
||||
# Sidekiq-cron: load recurring jobs from gitlab.yml
|
||||
Sidekiq::Cron::Job.load_from_hash! Gitlab.config.cron_jobs
|
||||
# UGLY Hack to get nested hash from settingslogic
|
||||
cron_jobs = JSON.parse(Gitlab.config.cron_jobs.to_json)
|
||||
# UGLY hack: Settingslogic doesn't allow 'class' key
|
||||
cron_jobs.each { |k,v| cron_jobs[k]['class'] = cron_jobs[k].delete('job_class') }
|
||||
Sidekiq::Cron::Job.load_from_hash! cron_jobs
|
||||
|
||||
# Database pool should be at least `sidekiq_concurrency` + 2
|
||||
# For more info, see: https://github.com/mperham/sidekiq/blob/master/4.0-Upgrade.md
|
||||
|
|
Loading…
Reference in New Issue