diff options
author | Sergey Novikov <novikov359@gmail.com> | 2016-01-23 02:50:03 +0300 |
---|---|---|
committer | Sergey Novikov <novikov359@gmail.com> | 2016-01-23 02:50:03 +0300 |
commit | a17f7a0bc12d1d2a4cbc8dfa62d3bcb94ed48c45 (patch) | |
tree | c6a2a632e72ca4d54537aee7a39c71399525900a /actioncable | |
parent | 91656aed59d45893383c99d068f42774a22ac254 (diff) | |
download | rails-a17f7a0bc12d1d2a4cbc8dfa62d3bcb94ed48c45.tar.gz rails-a17f7a0bc12d1d2a4cbc8dfa62d3bcb94ed48c45.tar.bz2 rails-a17f7a0bc12d1d2a4cbc8dfa62d3bcb94ed48c45.zip |
Rename channels_path var and fix channel_paths method for ActionCable config
Diffstat (limited to 'actioncable')
-rw-r--r-- | actioncable/lib/action_cable/server/configuration.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/actioncable/lib/action_cable/server/configuration.rb b/actioncable/lib/action_cable/server/configuration.rb index 236096fb5f..9a248933c4 100644 --- a/actioncable/lib/action_cable/server/configuration.rb +++ b/actioncable/lib/action_cable/server/configuration.rb @@ -5,7 +5,7 @@ module ActionCable class Configuration attr_accessor :logger, :log_tags attr_accessor :connection_class, :worker_pool_size - attr_accessor :channels_path + attr_accessor :channel_load_paths attr_accessor :disable_request_forgery_protection, :allowed_request_origins attr_accessor :cable, :url @@ -15,15 +15,15 @@ module ActionCable @connection_class = ApplicationCable::Connection @worker_pool_size = 100 - @channels_path = [Rails.root.join('app/channels')] + @channel_load_paths = [Rails.root.join('app/channels')] @disable_request_forgery_protection = false end def channel_paths - @channels ||= channels_path.collect do |channel_path| - Dir["#{channel_path}/**/*_channel.rb"] - end.flatten + @channel_paths ||= channel_load_paths.flat_map do |path| + Dir["#{path}/**/*_channel.rb"] + end end def channel_class_names |