aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/lib
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2018-09-06 14:23:44 -0400
committerGitHub <noreply@github.com>2018-09-06 14:23:44 -0400
commit2de047dbeb88215e1b5b86c1154e7d0f3002f9ba (patch)
tree6246d954cd5e49a14e68865cc81806c0dc8d1625 /actioncable/lib
parent53be0132c3f66dd8510921215d940641bbfd9588 (diff)
parentbcd11e07b5369b661e869631dc485fd5e3ce88a5 (diff)
downloadrails-2de047dbeb88215e1b5b86c1154e7d0f3002f9ba.tar.gz
rails-2de047dbeb88215e1b5b86c1154e7d0f3002f9ba.tar.bz2
rails-2de047dbeb88215e1b5b86c1154e7d0f3002f9ba.zip
Merge pull request #33798 from got2be/actioncable-redis-client-name
ActionCable: add id option to redis adapter config
Diffstat (limited to 'actioncable/lib')
-rw-r--r--actioncable/lib/action_cable/subscription_adapter/redis.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actioncable/lib/action_cable/subscription_adapter/redis.rb b/actioncable/lib/action_cable/subscription_adapter/redis.rb
index c28951608f..ad8fa52760 100644
--- a/actioncable/lib/action_cable/subscription_adapter/redis.rb
+++ b/actioncable/lib/action_cable/subscription_adapter/redis.rb
@@ -13,7 +13,8 @@ module ActionCable
# Overwrite this factory method for Redis connections if you want to use a different Redis library than the redis gem.
# This is needed, for example, when using Makara proxies for distributed Redis.
cattr_accessor :redis_connector, default: ->(config) do
- ::Redis.new(config.slice(:url, :host, :port, :db, :password))
+ config[:id] ||= "ActionCable-PID-#{$$}"
+ ::Redis.new(config.slice(:url, :host, :port, :db, :password, :id))
end
def initialize(*)