From 11d41c6ef80e0dc3d62b6b60ce85e5c5c6867f06 Mon Sep 17 00:00:00 2001 From: willnet Date: Mon, 2 May 2016 23:33:12 +0900 Subject: [ci skip] Fix ActionCable README default worker pool size was changed from 100 to 4 at #24376 --- actioncable/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actioncable/README.md') diff --git a/actioncable/README.md b/actioncable/README.md index fe4d213485..7a5ddaf2f1 100644 --- a/actioncable/README.md +++ b/actioncable/README.md @@ -385,7 +385,7 @@ Rails.application.config.action_cable.log_tags = [ For a full list of all configuration options, see the `ActionCable::Server::Configuration` class. -Also note that your server must provide at least the same number of database connections as you have workers. The default worker pool is set to 100, so that means you have to make at least that available. You can change that in `config/database.yml` through the `pool` attribute. +Also note that your server must provide at least the same number of database connections as you have workers. The default worker pool is set to 4, so that means you have to make at least that available. You can change that in `config/database.yml` through the `pool` attribute. ## Running the cable server -- cgit v1.2.3 From 7d55c846f11a435a4c7aae58f99279a2b9dd8506 Mon Sep 17 00:00:00 2001 From: Jon Moss Date: Fri, 6 May 2016 11:07:27 -0400 Subject: http --> https [ci skip] --- actioncable/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actioncable/README.md') diff --git a/actioncable/README.md b/actioncable/README.md index 7a5ddaf2f1..1d9864292f 100644 --- a/actioncable/README.md +++ b/actioncable/README.md @@ -293,7 +293,7 @@ The rebroadcast will be received by all connected clients, _including_ the clien ### More complete examples -See the [rails/actioncable-examples](http://github.com/rails/actioncable-examples) repository for a full example of how to setup Action Cable in a Rails app, and how to add channels. +See the [rails/actioncable-examples](https://github.com/rails/actioncable-examples) repository for a full example of how to setup Action Cable in a Rails app, and how to add channels. ## Configuration -- cgit v1.2.3 From 017c7f46e0aadffd2e5f02efb5918c0439716a7e Mon Sep 17 00:00:00 2001 From: "yuuji.yaginuma" Date: Sat, 7 May 2016 12:12:27 +0900 Subject: change cable.coffee to cable.js [ci skip] In #23935, cable file was to be provided by the javascript instead of coffeescript, doc was also been modified to use javascript. --- actioncable/README.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'actioncable/README.md') diff --git a/actioncable/README.md b/actioncable/README.md index 1d9864292f..8792113664 100644 --- a/actioncable/README.md +++ b/actioncable/README.md @@ -86,12 +86,17 @@ end The client-side needs to setup a consumer instance of this connection. That's done like so: -```coffeescript -# app/assets/javascripts/cable.coffee -#= require action_cable +```js +// app/assets/javascripts/cable.js +//= require action_cable +//= require_self +//= require_tree ./channels + +(function() { + this.App || (this.App = {}); -@App = {} -App.cable = ActionCable.createConsumer("ws://cable.example.com") + App.cable = ActionCable.createConsumer("ws://cable.example.com"); +}).call(this); ``` The `ws://cable.example.com` address must point to your Action Cable server(s), and it -- cgit v1.2.3 From 5983226161d024f13a4756c83dfa7642b259a937 Mon Sep 17 00:00:00 2001 From: Anubhav Saxena Date: Fri, 27 May 2016 08:58:55 +0530 Subject: Bash markdown syntax Added 'sh' for markdown formatting as bash. --- actioncable/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actioncable/README.md') diff --git a/actioncable/README.md b/actioncable/README.md index 8792113664..71fec714f5 100644 --- a/actioncable/README.md +++ b/actioncable/README.md @@ -408,7 +408,7 @@ run ActionCable.server ``` Then you start the server using a binstub in bin/cable ala: -``` +```sh #!/bin/bash bundle exec puma -p 28080 cable/config.ru ``` -- cgit v1.2.3