aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2017-02-23 11:37:08 +1030
committerGitHub <noreply@github.com>2017-02-23 11:37:08 +1030
commit45468b87f1adeca8d6f7d11b4f09b4ecaf624ccf (patch)
tree3ba64cf17f45af24764cda4d609f344aae210b0f /actioncable
parent630e709ea6cb535b45a9cbd89c08c572646f5608 (diff)
parent3721b859b605233ae577453532e71b0a969e8116 (diff)
downloadrails-45468b87f1adeca8d6f7d11b4f09b4ecaf624ccf.tar.gz
rails-45468b87f1adeca8d6f7d11b4f09b4ecaf624ccf.tar.bz2
rails-45468b87f1adeca8d6f7d11b4f09b4ecaf624ccf.zip
Merge pull request #28114 from matthewd/deprecated-evented-redis
Deprecate the EventedRedis subscription adapter
Diffstat (limited to 'actioncable')
-rw-r--r--actioncable/lib/action_cable/subscription_adapter/evented_redis.rb6
-rw-r--r--actioncable/test/subscription_adapter/evented_redis_test.rb4
2 files changed, 9 insertions, 1 deletions
diff --git a/actioncable/lib/action_cable/subscription_adapter/evented_redis.rb b/actioncable/lib/action_cable/subscription_adapter/evented_redis.rb
index 56b068976b..ed8f315791 100644
--- a/actioncable/lib/action_cable/subscription_adapter/evented_redis.rb
+++ b/actioncable/lib/action_cable/subscription_adapter/evented_redis.rb
@@ -24,6 +24,12 @@ module ActionCable
cattr_accessor(:redis_connector) { ->(config) { ::Redis.new(url: config[:url]) } }
def initialize(*)
+ ActiveSupport::Deprecation.warn(<<-MSG.squish)
+ The "evented_redis" subscription adapter is deprecated and
+ will be removed in Rails 5.2. Please use the "redis" adapter
+ instead.
+ MSG
+
super
@redis_connection_for_broadcasts = @redis_connection_for_subscriptions = nil
end
diff --git a/actioncable/test/subscription_adapter/evented_redis_test.rb b/actioncable/test/subscription_adapter/evented_redis_test.rb
index c55d35848e..256458bc24 100644
--- a/actioncable/test/subscription_adapter/evented_redis_test.rb
+++ b/actioncable/test/subscription_adapter/evented_redis_test.rb
@@ -7,7 +7,9 @@ class EventedRedisAdapterTest < ActionCable::TestCase
include ChannelPrefixTest
def setup
- super
+ assert_deprecated do
+ super
+ end
# em-hiredis is warning-rich
@previous_verbose, $VERBOSE = $VERBOSE, nil