diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-19 09:08:59 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-19 09:08:59 +0000 |
| commit | c1fc5da123a1fe670e32740669a9d5e59eff38f5 (patch) | |
| tree | 9e872d4057232aed3e5e0304cdfa04db74ba8464 /config/initializers | |
| parent | 82a708b9f0adca259062555d16a9720f9955993b (diff) | |
| download | gitlab-ce-c1fc5da123a1fe670e32740669a9d5e59eff38f5.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/1_settings.rb | 2 | ||||
| -rw-r--r-- | config/initializers/sidekiq.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index aa743416e99..5f07b486aea 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -446,7 +446,7 @@ Settings.cron_jobs['stuck_import_jobs_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['stuck_import_jobs_worker']['cron'] ||= '15 * * * *' Settings.cron_jobs['stuck_import_jobs_worker']['job_class'] = 'StuckImportJobsWorker' Settings.cron_jobs['gitlab_usage_ping_worker'] ||= Settingslogic.new({}) -Settings.cron_jobs['gitlab_usage_ping_worker']['cron'] ||= Settings.__send__(:cron_for_usage_ping) +Settings.cron_jobs['gitlab_usage_ping_worker']['cron'] ||= nil # This is dynamically loaded in the sidekiq initializer Settings.cron_jobs['gitlab_usage_ping_worker']['job_class'] = 'GitlabUsagePingWorker' Settings.cron_jobs['stuck_merge_jobs_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['stuck_merge_jobs_worker']['cron'] ||= '0 */2 * * *' diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index b90a04a19e1..22536b60ca1 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'sidekiq/web' def enable_reliable_fetch? @@ -71,6 +73,8 @@ Sidekiq.configure_server do |config| Sidekiq::ReliableFetch.setup_reliable_fetch!(config) end + Gitlab.config.load_dynamic_cron_schedules! + # Sidekiq-cron: load recurring jobs from gitlab.yml # UGLY Hack to get nested hash from settingslogic cron_jobs = JSON.parse(Gitlab.config.cron_jobs.to_json) |