aboutsummaryrefslogtreecommitdiffstats
path: root/lib/action_cable/channel/base.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2015-07-04 21:30:48 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2015-07-04 21:30:48 +0200
commit0de65cf2d8860377d45020a83866073c5fec188c (patch)
treed39b559162936fd79049595d69098fd7712a8fe3 /lib/action_cable/channel/base.rb
parent9886a995f5f0b32d0d400074c48221cb0f6b911e (diff)
parent5de01033150b70982f23a42670c55348a7371c4b (diff)
downloadrails-0de65cf2d8860377d45020a83866073c5fec188c.tar.gz
rails-0de65cf2d8860377d45020a83866073c5fec188c.tar.bz2
rails-0de65cf2d8860377d45020a83866073c5fec188c.zip
Merge branch 'master' of github.com:basecamp/action_cable
Diffstat (limited to 'lib/action_cable/channel/base.rb')
-rw-r--r--lib/action_cable/channel/base.rb10
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/action_cable/channel/base.rb b/lib/action_cable/channel/base.rb
index 12a5789bdc..335d2d9d7c 100644
--- a/lib/action_cable/channel/base.rb
+++ b/lib/action_cable/channel/base.rb
@@ -2,7 +2,7 @@ module ActionCable
module Channel
class Base
include Callbacks
- include Redis
+ include Streams
on_subscribe :start_periodic_timers
on_unsubscribe :stop_periodic_timers
@@ -10,16 +10,10 @@ module ActionCable
attr_reader :params, :connection
delegate :logger, to: :connection
- class_attribute :channel_name
-
class << self
def matches?(identifier)
raise "Please implement #{name}#matches? method"
end
-
- def find_name
- @name ||= channel_name || to_s.demodulize.underscore
- end
end
def initialize(connection, channel_identifier, params = {})
@@ -138,4 +132,4 @@ module ActionCable
end
end
end
-end \ No newline at end of file
+end