diff options
author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-07-29 21:57:20 +0200 |
---|---|---|
committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-07-29 21:57:20 +0200 |
commit | ae61460cb2ebcc25528686d896c136522690f083 (patch) | |
tree | 65036480d3fddc27f0bfafd17d10eb1e27debc91 /lib/action_cable/server | |
parent | 437ed97f7611cb34c6f47d27df25053f988a228f (diff) | |
parent | 5954fd1e0aa907e07ffff932aedc51109d4ce56d (diff) | |
download | rails-ae61460cb2ebcc25528686d896c136522690f083.tar.gz rails-ae61460cb2ebcc25528686d896c136522690f083.tar.bz2 rails-ae61460cb2ebcc25528686d896c136522690f083.zip |
Merge pull request #34 from lsylvester/add-broadcast_to-and-stream_for-methods-to-channel
add broadcast_to and stream_for methods as per #26
Diffstat (limited to 'lib/action_cable/server')
-rw-r--r-- | lib/action_cable/server/base.rb | 4 | ||||
-rw-r--r-- | lib/action_cable/server/broadcasting.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/action_cable/server/base.rb b/lib/action_cable/server/base.rb index fe7966e090..b09fbf6da4 100644 --- a/lib/action_cable/server/base.rb +++ b/lib/action_cable/server/base.rb @@ -9,7 +9,7 @@ module ActionCable include ActionCable::Server::Connections cattr_accessor(:config, instance_accessor: true) { ActionCable::Server::Configuration.new } - + def self.logger; config.logger; end delegate :logger, to: :config @@ -56,7 +56,7 @@ module ActionCable logger.info "[ActionCable] Redis reconnect failed." # logger.info "[ActionCable] Redis reconnected. Closing all the open connections." # @connections.map &:close - end + end end end diff --git a/lib/action_cable/server/broadcasting.rb b/lib/action_cable/server/broadcasting.rb index 4f72ffd96f..037b98951e 100644 --- a/lib/action_cable/server/broadcasting.rb +++ b/lib/action_cable/server/broadcasting.rb @@ -32,7 +32,7 @@ module ActionCable # The redis instance used for broadcasting. Not intended for direct user use. def broadcasting_redis @broadcasting_redis ||= Redis.new(config.redis) - end + end private class Broadcaster |