diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2016-06-26 16:34:23 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2016-06-26 16:34:23 +0000 |
| commit | 5343626ea8b17a92b6b4603f2404ba06800b21b1 (patch) | |
| tree | 72353706fa687d111247f86486d293b759aa3f8e /guides | |
| parent | 60e28900405b3cac4623ac050dc189038c0be0d3 (diff) | |
| parent | b94b04b1d11b1d095918b8bae2b6b5f76f092cf7 (diff) | |
| download | rails-5343626ea8b17a92b6b4603f2404ba06800b21b1.tar.gz rails-5343626ea8b17a92b6b4603f2404ba06800b21b1.tar.bz2 rails-5343626ea8b17a92b6b4603f2404ba06800b21b1.zip | |
Merge branch 'master' of github.com:rails/docrails
Conflicts:
actioncable/README.md
Diffstat (limited to 'guides')
| -rw-r--r-- | guides/source/action_cable_overview.md | 9 | ||||
| -rw-r--r-- | guides/source/active_support_core_extensions.md | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/guides/source/action_cable_overview.md b/guides/source/action_cable_overview.md index 16aa9438a2..2308befd12 100644 --- a/guides/source/action_cable_overview.md +++ b/guides/source/action_cable_overview.md @@ -6,8 +6,10 @@ incorporate real-time features into your Rails application. After reading this guide, you will know: +* What Action Cable is and its integration on backend and frontend * How to setup Action Cable * How to setup channels +* Deployment and Architecture setup for running Action Cable Introduction ------------ @@ -568,12 +570,13 @@ environment configuration files. ### Other Configurations -The other common option to configure is the log tags applied to the -per-connection logger. Here's close to what we're using in Basecamp: +The other common option to configure, is the log tags applied to the +per-connection logger. Here's an example that uses +the user account id if available, else "no-account" while tagging: ```ruby config.action_cable.log_tags = [ - -> request { request.env['bc.account_id'] || "no-account" }, + -> request { request.env['user_account_id'] || "no-account" }, :action_cable, -> request { request.uuid } ] diff --git a/guides/source/active_support_core_extensions.md b/guides/source/active_support_core_extensions.md index 565c87c4b5..e0b6f2f820 100644 --- a/guides/source/active_support_core_extensions.md +++ b/guides/source/active_support_core_extensions.md @@ -954,7 +954,8 @@ class A class_attribute :x, instance_reader: false end -A.new.x = 1 # NoMethodError +A.new.x = 1 +A.new.x # NoMethodError ``` For convenience `class_attribute` also defines an instance predicate which is the double negation of what the instance reader returns. In the examples above it would be called `x?`. |