diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-04 00:09:39 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-04 00:09:39 +0300 |
| commit | 879876325f48fd3ec97f2a4f99a52fb0b1a9b8df (patch) | |
| tree | dfede1226840209d8c6cdf61177cceed48cadef2 /config | |
| parent | b63f3afa42a43e2a261a989f87e9ccd1e18caaa5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 5 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 6 | ||||
| -rw-r--r-- | config/initializers/action_cable.rb (renamed from config/initializers/actioncable.rb) | 1 |
3 files changed, 12 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 8121077d4c1..9136bb0b569 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -1065,6 +1065,11 @@ production: &base # host: localhost # port: 3808 + ## ActionCable settings + action_cable: + # Number of threads used to process ActionCable connection callbacks and channel actions + # worker_pool_size: 4 + ## Monitoring # Built in monitoring settings monitoring: diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 03067db09b1..3ebe9476ace 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -718,6 +718,12 @@ Settings.webpack.dev_server['host'] ||= 'localhost' Settings.webpack.dev_server['port'] ||= 3808 # +# ActionCable settings +# +Settings['action_cable'] ||= Settingslogic.new({}) +Settings.action_cable['worker_pool_size'] ||= 4 + +# # Monitoring settings # Settings['monitoring'] ||= Settingslogic.new({}) diff --git a/config/initializers/actioncable.rb b/config/initializers/action_cable.rb index ed96f965150..79a6ca5e18a 100644 --- a/config/initializers/actioncable.rb +++ b/config/initializers/action_cable.rb @@ -5,4 +5,5 @@ Rails.application.configure do # we're running ActionCable as a standalone server config.action_cable.mount_path = nil config.action_cable.url = Gitlab::Utils.append_path(Gitlab.config.gitlab.relative_url_root, '/-/cable') + config.action_cable.worker_pool_size = Gitlab.config.action_cable.worker_pool_size end |