diff options
author | Jon Moss <me@jonathanmoss.me> | 2016-01-15 17:26:17 -0500 |
---|---|---|
committer | Jon Moss <me@jonathanmoss.me> | 2016-01-18 18:59:28 -0500 |
commit | 75489642c8dcb4c75ccc14b909113a2828d6acb8 (patch) | |
tree | b94be041abff3c62c4cb1381ab0dbdf63eb6f9be /actioncable/lib/action_cable/storage_adapter/redis.rb | |
parent | 78ff63ee4191758940ae8e0efaa5f9915af0a788 (diff) | |
download | rails-75489642c8dcb4c75ccc14b909113a2828d6acb8.tar.gz rails-75489642c8dcb4c75ccc14b909113a2828d6acb8.tar.bz2 rails-75489642c8dcb4c75ccc14b909113a2828d6acb8.zip |
config_opts => cable, per @kaspth
Diffstat (limited to 'actioncable/lib/action_cable/storage_adapter/redis.rb')
-rw-r--r-- | actioncable/lib/action_cable/storage_adapter/redis.rb | 7 |
1 files changed, 4 insertions, 3 deletions
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 |