diff options
| author | Jon Moss <me@jonathanmoss.me> | 2016-01-06 17:16:02 -0500 |
|---|---|---|
| committer | Jon Moss <me@jonathanmoss.me> | 2016-01-18 18:58:57 -0500 |
| commit | 0016e0410b11d40a1d730a1232c40f428d67abeb (patch) | |
| tree | 172b2fe1e0e2424a2eab33c95ec38487d5b5996d /railties/lib | |
| parent | 75f1b229fdb340b2cdaf632bb6a223213f05dc75 (diff) | |
| download | rails-0016e0410b11d40a1d730a1232c40f428d67abeb.tar.gz rails-0016e0410b11d40a1d730a1232c40f428d67abeb.tar.bz2 rails-0016e0410b11d40a1d730a1232c40f428d67abeb.zip | |
Adapterize ActionCable storage and extract behavior
Diffstat (limited to 'railties/lib')
3 files changed, 14 insertions, 11 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index f4deec7135..7ec4d3bbd3 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -78,11 +78,11 @@ module Rails template "application.rb" template "environment.rb" template "secrets.yml" + template "cable.yml" unless options[:skip_action_cable] directory "environments" directory "initializers" directory "locales" - directory "redis" unless options[:skip_action_cable] end end @@ -315,7 +315,7 @@ module Rails def delete_action_cable_files_skipping_action_cable if options[:skip_action_cable] - remove_file 'config/redis/cable.yml' + remove_file 'config/cable.yml' remove_file 'app/assets/javascripts/cable.coffee' remove_dir 'app/channels' end diff --git a/railties/lib/rails/generators/rails/app/templates/config/cable.yml b/railties/lib/rails/generators/rails/app/templates/config/cable.yml new file mode 100644 index 0000000000..004adb7b3c --- /dev/null +++ b/railties/lib/rails/generators/rails/app/templates/config/cable.yml @@ -0,0 +1,12 @@ +# Action Cable uses Redis by default to administer connections, channels, and sending/receiving messages over the WebSocket. +production: + adapter: redis + url: redis://localhost:6379/1 + +development: + adapter: redis + url: redis://localhost:6379/2 + +test: + adapter: redis + url: redis://localhost:6379/3 diff --git a/railties/lib/rails/generators/rails/app/templates/config/redis/cable.yml b/railties/lib/rails/generators/rails/app/templates/config/redis/cable.yml deleted file mode 100644 index 0176be24f9..0000000000 --- a/railties/lib/rails/generators/rails/app/templates/config/redis/cable.yml +++ /dev/null @@ -1,9 +0,0 @@ -# Action Cable uses Redis to administer connections, channels, and sending/receiving messages over the WebSocket. -production: - url: redis://localhost:6379/1 - -development: - url: redis://localhost:6379/2 - -test: - url: redis://localhost:6379/3 |