diff options
| author | claudiob <claudiob@gmail.com> | 2016-01-24 20:48:25 -0800 |
|---|---|---|
| committer | claudiob <claudiob@gmail.com> | 2016-01-25 18:49:40 -0800 |
| commit | 6accef4e11b0c793e1c085536b5ed27f32b6a0c3 (patch) | |
| tree | 29030a8d0a0128917b8d0177fdc27633705ea4ad | |
| parent | c48790e4f6d3b733c55e7812f10ccad220ee7f81 (diff) | |
| download | rails-6accef4e11b0c793e1c085536b5ed27f32b6a0c3.tar.gz rails-6accef4e11b0c793e1c085536b5ed27f32b6a0c3.tar.bz2 rails-6accef4e11b0c793e1c085536b5ed27f32b6a0c3.zip | |
[ci skip] Don’t explicitly mention EventMachine
Since #23152 eliminated the EventMachine dependency, we don’t need to
explicitly mention EventMachine.
Nevertheless, I'm not 100% sure about saying "the websocket-driver loop"
driver… any suggestions, @matthewd or @pixeltrix ? :sweat_smile:
[ci skip]
3 files changed, 6 insertions, 7 deletions
diff --git a/actioncable/README.md b/actioncable/README.md index 63e328321b..cad71ddf94 100644 --- a/actioncable/README.md +++ b/actioncable/README.md @@ -443,11 +443,10 @@ The Ruby side of things is built on top of [faye-websocket](https://github.com/f ## Deployment -Action Cable is powered by a combination of EventMachine and threads. The -framework plumbing needed for connection handling is handled in the -EventMachine loop, but the actual channel, user-specified, work is handled -in a normal Ruby thread. This means you can use all your regular Rails models -with no problem, as long as you haven't committed any thread-safety sins. +Action Cable is powered by a combination of websockets and threads. All of the +connection management is handled internally by utilizing Ruby’s native thread +support, which means you can use all your regular Rails models with no problems +as long as you haven’t committed any thread-safety sins. But this also means that Action Cable needs to run in its own server process. So you'll have one set of server processes for your normal web work, and another diff --git a/railties/lib/rails/generators/rails/app/templates/app/channels/application_cable/channel.rb b/railties/lib/rails/generators/rails/app/templates/app/channels/application_cable/channel.rb index 438c84154d..d56fa30f4d 100644 --- a/railties/lib/rails/generators/rails/app/templates/app/channels/application_cable/channel.rb +++ b/railties/lib/rails/generators/rails/app/templates/app/channels/application_cable/channel.rb @@ -1,4 +1,4 @@ -# Be sure to restart your server when you modify this file. Action Cable runs in an EventMachine loop that does not support auto reloading. +# Be sure to restart your server when you modify this file. Action Cable runs in a loop that does not support auto reloading. module ApplicationCable class Channel < ActionCable::Channel::Base end diff --git a/railties/lib/rails/generators/rails/app/templates/app/channels/application_cable/connection.rb b/railties/lib/rails/generators/rails/app/templates/app/channels/application_cable/connection.rb index 965046f3c7..b4f41389ad 100644 --- a/railties/lib/rails/generators/rails/app/templates/app/channels/application_cable/connection.rb +++ b/railties/lib/rails/generators/rails/app/templates/app/channels/application_cable/connection.rb @@ -1,4 +1,4 @@ -# Be sure to restart your server when you modify this file. Action Cable runs in an EventMachine loop that does not support auto reloading. +# Be sure to restart your server when you modify this file. Action Cable runs in a loop that does not support auto reloading. module ApplicationCable class Connection < ActionCable::Connection::Base end |