summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAndrew Newdigate <andrew@gitlab.com>2019-07-16 22:10:44 +0200
committerAndrew Newdigate <andrew@gitlab.com>2019-07-18 19:04:12 +0200
commitdc14c91d065d869b77b0ec0db47b8b36c96f15be (patch)
treeada79dc72cdb0badc101a6034c3100c8beb0dae9 /config
parentf97a73fa39b48b6c3c770d609fcd9584d17221da (diff)
downloadgitlab-ce-dc14c91d065d869b77b0ec0db47b8b36c96f15be.tar.gz
Adds chaos endpoints to Sidekiqan-sidekiq-chaos
This allows the chaos endpoints to be invoked in Sidekiq so that this environment can be tested for resilience.
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb2
-rw-r--r--config/sidekiq_queues.yml1
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]