From 75489642c8dcb4c75ccc14b909113a2828d6acb8 Mon Sep 17 00:00:00 2001 From: Jon Moss Date: Fri, 15 Jan 2016 17:26:17 -0500 Subject: config_opts => cable, per @kaspth --- actioncable/lib/action_cable/storage_adapter/redis.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'actioncable/lib/action_cable/storage_adapter/redis.rb') diff --git a/actioncable/lib/action_cable/storage_adapter/redis.rb b/actioncable/lib/action_cable/storage_adapter/redis.rb index 3f0f6c4172..3e0ede057a 100644 --- a/actioncable/lib/action_cable/storage_adapter/redis.rb +++ b/actioncable/lib/action_cable/storage_adapter/redis.rb @@ -27,14 +27,15 @@ module ActionCable # The EventMachine Redis instance used by the pubsub adapter. def hi_redis_conn - @redis ||= EM::Hiredis.connect(@server.config.config_opts[:url]).tap do |redis| + @hi_redis_conn ||= EM::Hiredis.connect(@server.config.cable[:url]).tap do |redis| redis.on(:reconnect_failed) do @logger.info "[ActionCable] Redis reconnect failed." - # logger.info "[ActionCable] Redis reconnected. Closing all the open connections." - # @connections.map &:close end end end + def redis_conn + @redis_conn ||= ::Redis.new(@server.config.cable) + end end end end -- cgit v1.2.3