diff options
| author | Gabriel Mazetto <gabriel@gitlab.com> | 2015-12-22 12:42:39 -0200 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-12-22 14:39:15 -0500 |
| commit | 0c3ac036cc0626b65d930145f55280b22d395c02 (patch) | |
| tree | 7ec99ef5898c2f892c6f89fe5428c19cbcc40b4c | |
| parent | b0f1453fc4e73fe7d6b8052047ddf0d50b1fb37a (diff) | |
| download | gitlab-ce-0c3ac036cc0626b65d930145f55280b22d395c02.tar.gz | |
Hotfix for sidekiq-cron being loaded from Settingslogic with defaults
| -rw-r--r-- | config/initializers/1_settings.rb | 2 | ||||
| -rw-r--r-- | config/initializers/sidekiq.rb | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index a31235454a7..199ca156e32 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -230,7 +230,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' # diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index b42b718a7db..dcf6ce74d96 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -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 |