aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/lib/action_cable/engine.rb
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2016-02-14 18:08:46 +0100
committerKasper Timm Hansen <kaspth@gmail.com>2016-02-14 18:08:46 +0100
commit3c96a6eaa42873147d4be4c753981b7e99a2ba4f (patch)
tree5831bddc71ea351d2a5f946218b5977634f958ff /actioncable/lib/action_cable/engine.rb
parent6f8f2a2017e09d8d94c70761c70007ce72b984e7 (diff)
parent3ae8eb13cb4967f533339ecddf93e19f06caa6d2 (diff)
downloadrails-3c96a6eaa42873147d4be4c753981b7e99a2ba4f.tar.gz
rails-3c96a6eaa42873147d4be4c753981b7e99a2ba4f.tar.bz2
rails-3c96a6eaa42873147d4be4c753981b7e99a2ba4f.zip
Merge pull request #23505 from kaspth/inject-rails-config-through-railtie
Inject Rails related configuration through Railtie
Diffstat (limited to 'actioncable/lib/action_cable/engine.rb')
-rw-r--r--actioncable/lib/action_cable/engine.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/actioncable/lib/action_cable/engine.rb b/actioncable/lib/action_cable/engine.rb
index f5e233e091..f5f1cb59e0 100644
--- a/actioncable/lib/action_cable/engine.rb
+++ b/actioncable/lib/action_cable/engine.rb
@@ -31,6 +31,12 @@ module ActionCable
self.cable = Rails.application.config_for(config_path).with_indifferent_access
end
+ if 'ApplicationCable::Connection'.safe_constantize
+ self.connection_class = ApplicationCable::Connection
+ end
+
+ self.channel_paths = Rails.application.paths['app/channels'].existent
+
options.each { |k,v| send("#{k}=", v) }
end
end