From deac98875612167ca207c6bff26427717ad32436 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 16 Dec 2015 15:31:25 +0100 Subject: Include changes made to the engine --- actioncable/lib/action_cable/railtie.rb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'actioncable') diff --git a/actioncable/lib/action_cable/railtie.rb b/actioncable/lib/action_cable/railtie.rb index d4833eb9e3..1faecb19d7 100644 --- a/actioncable/lib/action_cable/railtie.rb +++ b/actioncable/lib/action_cable/railtie.rb @@ -19,11 +19,16 @@ module ActionCable end initializer "action_cable.set_configs" do |app| + app.paths.add "config/redis/cable", with: "config/redis/cable.yml" + options = app.config.action_cable options.allowed_request_origins ||= "http://localhost:3000" if ::Rails.env.development? ActiveSupport.on_load(:action_cable) do + path = Pathname.new(paths["config/redis/cable"].existent.first) + self.redis = Rails.application.config_for(redis_path).with_indifferent_access + options.each { |k,v| send("#{k}=", v) } end end -- cgit v1.2.3