diff options
author | Rémy Coutable <remy@rymai.me> | 2016-07-20 11:28:57 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-07-20 14:57:05 +0200 |
commit | 634b6239425f4f2f16dcc7b4f4f93827d05efa39 (patch) | |
tree | 6a42802cef3001b01252635526e4729cc9fd142e | |
parent | a079ee5dbfec128d84ac43f721355d36fe7e4e44 (diff) | |
download | gitlab-ce-634b6239425f4f2f16dcc7b4f4f93827d05efa39.tar.gz |
Merge branch 'regression/cron_jobs_validation' into 'master'
Log cron_jobs configuration instead of raising exception
## What does this MR do?
Log cron_jobs configuration errors and remove invalid key <-> values from the configuration hash instead of raising an exception.
This has been discussed at #20010.
Fixes #20010
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
Original implementation !5318, introduced a regression with our docker packaging: #20010.
## What are the relevant issue numbers?
* #20010
* #18378
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5360
-rw-r--r-- | CHANGELOG | 2 | ||||
-rw-r--r-- | config/initializers/sidekiq.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 7bec5246544..bcb9642737f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -126,7 +126,7 @@ v 8.10.0 (unreleased) - Fix last update timestamp on issues not preserved on gitlab.com and project imports - Fix issues importing projects from EE to CE - Fix creating group with space in group path - - Improve cron_jobs loading error messages !5318 + - Improve cron_jobs loading error messages !5318 / !5360 - Create Todos for Issue author when assign or mention himself (Katarzyna Kobierska) - Limit the number of retries on error to 3 for exporting projects - Allow empty repositories on project import/export 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 |