diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-07-18 23:43:49 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-07-18 23:43:49 +0300 |
| commit | 5db5e50927e9c90c4a353897edb17eeda1f1f10f (patch) | |
| tree | 05e39a5c1402ee2f95ea9d8f28b9db4681b2db35 /config | |
| parent | b1d2aed43acc21cfe48f517dd9dbf624549c3db7 (diff) | |
| parent | dc14c91d065d869b77b0ec0db47b8b36c96f15be (diff) | |
Merge branch 'an-sidekiq-chaos' into 'master'
Adds chaos endpoints to Sidekiq
Closes #64663
See merge request gitlab-org/gitlab-ce!30814
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 2 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb index 641807203bf..459f2b22bf0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -116,7 +116,7 @@ Rails.application.routes.draw do end end - if ENV['GITLAB_CHAOS_SECRET'] || Rails.env.development? + if ENV['GITLAB_CHAOS_SECRET'] || Rails.env.development? || Rails.env.test? resource :chaos, only: [] do get :leakmem get :cpu_spin diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 80791795390..c7586aa1e38 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -95,6 +95,7 @@ - [update_project_statistics, 1] - [phabricator_import_import_tasks, 1] - [update_namespace_statistics, 1] + - [chaos, 2] # EE-specific queues - [ldap_group_sync, 2] |