aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable
diff options
context:
space:
mode:
authorClaudio B <claudiob@users.noreply.github.com>2016-01-25 18:51:05 -0800
committerClaudio B <claudiob@users.noreply.github.com>2016-01-25 18:51:05 -0800
commit35db4603095e8ccc0a92d925a42d4b3d9462580f (patch)
tree29030a8d0a0128917b8d0177fdc27633705ea4ad /actioncable
parentc48790e4f6d3b733c55e7812f10ccad220ee7f81 (diff)
parent6accef4e11b0c793e1c085536b5ed27f32b6a0c3 (diff)
downloadrails-35db4603095e8ccc0a92d925a42d4b3d9462580f.tar.gz
rails-35db4603095e8ccc0a92d925a42d4b3d9462580f.tar.bz2
rails-35db4603095e8ccc0a92d925a42d4b3d9462580f.zip
Merge pull request #23228 from claudiob/no-em
[ci skip] Don’t explicitly mention EventMachine
Diffstat (limited to 'actioncable')
-rw-r--r--actioncable/README.md9
1 files changed, 4 insertions, 5 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