summaryrefslogtreecommitdiff
path: root/config/initializers/action_cable.rb
diff options
context:
space:
mode:
Diffstat (limited to 'config/initializers/action_cable.rb')
-rw-r--r--config/initializers/action_cable.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/config/initializers/action_cable.rb b/config/initializers/action_cable.rb
index eb44ff00d09..c549dd45ad9 100644
--- a/config/initializers/action_cable.rb
+++ b/config/initializers/action_cable.rb
@@ -1,5 +1,7 @@
# frozen_string_literal: true
+require 'action_cable/subscription_adapter/redis'
+
Rails.application.configure do
# We only mount the ActionCable engine in tests where we run it in-app
# For other environments, we run it on a standalone Puma server
@@ -7,3 +9,11 @@ Rails.application.configure do
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
+
+# https://github.com/rails/rails/blob/bb5ac1623e8de08c1b7b62b1368758f0d3bb6379/actioncable/lib/action_cable/subscription_adapter/redis.rb#L18
+ActionCable::SubscriptionAdapter::Redis.redis_connector = lambda do |config|
+ args = config.except(:adapter, :channel_prefix)
+ .merge(instrumentation_class: ::Gitlab::Instrumentation::Redis::ActionCable)
+
+ ::Redis.new(args)
+end