diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-07 18:53:59 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-07 18:53:59 +0000 |
| commit | 1da71fa9ed4513d966a5824382fc87be4f0fb307 (patch) | |
| tree | 2645a269fde93fbb5665d6683aaff93e4515edcd /config/initializers/sidekiq.rb | |
| parent | 24c7eafb295a292ed5eb166688d638f7d3278261 (diff) | |
| parent | 496870ddec632ae13cff8b5e8f6ca0bff0fa3ec7 (diff) | |
| download | gitlab-ce-1da71fa9ed4513d966a5824382fc87be4f0fb307.tar.gz | |
Merge branch 'feature/sidekiq-cron' into 'master'
Migrate from Sidetiq to Sidekiq-cron
Migrate from Sidetiq to Sidekiq-cron
Updated Sidekiq to 3.5.x
This will solve #2355
See merge request !1982
Diffstat (limited to 'config/initializers/sidekiq.rb')
| -rw-r--r-- | config/initializers/sidekiq.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index e856499732e..6e5701e33da 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -17,6 +17,12 @@ Sidekiq.configure_server do |config| chain.add Gitlab::SidekiqMiddleware::ArgumentsLogger if ENV['SIDEKIQ_LOG_ARGUMENTS'] chain.add Gitlab::SidekiqMiddleware::MemoryKiller if ENV['SIDEKIQ_MEMORY_KILLER_MAX_RSS'] end + + # Sidekiq-cron: load recurring jobs from schedule.yml + schedule_file = 'config/schedule.yml' + if File.exists?(schedule_file) + Sidekiq::Cron::Job.load_from_hash YAML.load_file(schedule_file) + end end Sidekiq.configure_client do |config| |