summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGabriel Mazetto <gabriel@gitlab.com>2016-07-20 12:21:38 +0200
committerGabriel Mazetto <gabriel@gitlab.com>2016-07-20 12:50:42 +0200
commitd7ab81cf7d89f3edf6515f7d954e376029a17b88 (patch)
treea2cbcee41944c8b70a63d8f949cbcfe9866f1571 /config
parentef2edcc10007d5d838acf278ed1e9e0c07cdc4fc (diff)
downloadgitlab-ce-d7ab81cf7d89f3edf6515f7d954e376029a17b88.tar.gz
Log cron_jobs configuration instead of raising exception
Diffstat (limited to 'config')
-rw-r--r--config/initializers/sidekiq.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index b40fd81ff96..5e839327e7a 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -18,7 +18,8 @@ Sidekiq.configure_server do |config|
if cron_jobs[k] && cron_jobs_required_keys.all? { |s| cron_jobs[k].key?(s) }
cron_jobs[k]['class'] = cron_jobs[k].delete('job_class')
else
- raise("Invalid cron_jobs config key: '#{k}'. Check your gitlab config file.")
+ cron_jobs.delete(k)
+ Rails.logger.error("Invalid cron_jobs config key: '#{k}'. Check your gitlab config file.")
end
end
Sidekiq::Cron::Job.load_from_hash! cron_jobs