diff options
Diffstat (limited to 'config')
-rw-r--r-- | config/initializers/1_settings.rb | 2 | ||||
-rw-r--r-- | config/initializers/sidekiq.rb | 4 | ||||
-rw-r--r-- | config/settings.rb | 6 |
3 files changed, 11 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) diff --git a/config/settings.rb b/config/settings.rb index 767c6c56337..b6225be4b54 100644 --- a/config/settings.rb +++ b/config/settings.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'settingslogic' require 'digest/md5' @@ -143,6 +145,10 @@ class Settings < Settingslogic Gitlab::Application.secrets.db_key_base end + def load_dynamic_cron_schedules! + cron_jobs['gitlab_usage_ping_worker']['cron'] ||= cron_for_usage_ping + end + private def base_url(config) |