aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
* Adds basic automatic database switching to RailsEileen Uchitelle2019-01-301-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following PR adds behavior to Rails to allow an application to automatically switch it's connection from the primary to the replica. A request will be sent to the replica if: * The request is a read request (`GET` or `HEAD`) * AND It's been 2 seconds since the last write to the database (because we don't want to send a user to a replica if the write hasn't made it to the replica yet) A request will be sent to the primary if: * It's not a GET/HEAD request (ie is a POST, PATCH, etc) * Has been less than 2 seconds since the last write to the database The implementation that decides when to switch reads (the 2 seconds) is "safe" to use in production but not recommended without adequate testing with your infrastructure. At GitHub in addition to the a 5 second delay we have a curcuit breaker that checks the replication delay and will send the query to a replica before the 5 seconds has passed. This is specific to our application and therefore not something Rails should be doing for you. You'll need to test and implement more robust handling of when to switch based on your infrastructure. The auto switcher in Rails is meant to be a basic implementation / API that acts as a guide for how to implement autoswitching. The impementation here is meant to be strict enough that you know how to implement your own resolver and operations classes but flexible enough that we're not telling you how to do it. The middleware is not included automatically and can be installed in your application with the classes you want to use for the resolver and operations passed in. If you don't pass any classes into the middleware the Rails default Resolver and Session classes will be used. The Resolver decides what parameters define when to switch, Operations sets timestamps for the Resolver to read from. For example you may want to use cookies instead of a session so you'd implement a Resolver::Cookies class and pass that into the middleware via configuration options. ``` config.active_record.database_selector = { delay: 2.seconds } config.active_record.database_resolver = MyResolver config.active_record.database_operations = MyResolver::MyCookies ``` Your classes can inherit from the existing classes and reimplment the methods (or implement more methods) that you need to do the switching. You only need to implement methods that you want to change. For example if you wanted to set the session token for the last read from a replica you would reimplement the `read_from_replica` method in your resolver class and implement a method that updates a new timestamp in your operations class.
* Convert path to string before call `length`yuuji.yaginuma2019-01-281-1/+1
| | | | | | | | Because eager load paths support to using `Pathname`, and `Pathname` doesn't have `length` method. Ref: https://travis-ci.org/rails/rails/jobs/485088071#L5140-L5143 Follow up aadeed1518b9092ea21adf49c728172368129f0e.
* Simplify path prefix extractionXavier Noria2019-01-271-2/+3
|
* Fix typo: overriden -> overridden [ci skip] (#35060)Vipul A M2019-01-261-1/+1
|
* Merge pull request #34789 from christos/fix-editing-new-environment-credentialsKasper Timm Hansen2019-01-252-2/+12
|\ | | | | Don't load app environment when editing credentials
| * Don't load app environment when editing credentialsChristos Zisopoulos2018-12-262-2/+12
| | | | | | | | This avoids missing key exceptions caused by code that tries to read the credentials before they have been added to the encrypted file, for example when editing the credentials for a new environment.
* | Fix deeply nested namespace command printingGannon McGibbon2019-01-241-3/+11
| |
* | Merge pull request #34993 from schuetzm/allow-subdomains-of-localhostRafael França2019-01-231-1/+1
|\ \ | | | | | | Subdomains of localhost are safe against DNS rebinding
| * | Subdomains of localhost are safe against DNS rebindingMarc Schütz2019-01-231-1/+1
| | |
* | | Merge pull request #34997 from alkesh26/typo-fix-webserverEileen M. Uchitelle2019-01-222-3/+3
|\ \ \ | | | | | | | | Replaced webserver with web server
| * | | Changed webserver to web server.alkesh262019-01-222-3/+3
| |/ /
* | | Add Channel tests to `rails stats`bogdanvlviv2019-01-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Rails generates `test/channels`(#34933) and even allows `rails test:channels` (#34947). `rails stats` has been providing info about `app/channels`, it makes sense to add `test/channels` as well. (I've changed test because we generate `test/channels` with some code)
* | | Report statistics from ActionMailboxDan McGregor2019-01-201-0/+2
|/ /
* | Preparing for 6.0.0.beta1 releaseRafael Mendonça França2019-01-181-1/+1
| |
* | Revert "Remove deprecated `server` argument from the rails server command"yuuji.yaginuma2019-01-181-2/+21
| | | | | | | | | | | | This reverts commit fa791fb8e2a718b5d0430c7ca5a454678dfc192d. Reason: `server` argument was deprecated in Rails 6.0. Ref: #32058.
* | Use released webpackerRafael Mendonça França2019-01-171-1/+1
| |
* | Remove deprecated `after_bundle` helper inside plugins templatesRafael Mendonça França2019-01-173-21/+12
| |
* | Remove deprecated `server` argument from the rails server commandRafael Mendonça França2019-01-171-21/+2
| |
* | Remove deprecated support to old `config.ru` that use the application class ↵Rafael Mendonça França2019-01-171-13/+0
| | | | | | | | as argument of `run`
* | Remove deprecated `environment` argument from the rails commandsRafael Mendonça França2019-01-171-11/+1
| |
* | Remove deprecated `capify!`Rafael Mendonça França2019-01-171-9/+0
| |
* | Remove deprecated `config.secret_token`Rafael Mendonça França2019-01-172-20/+5
| |
* | Change `SQLite3Adapter` to always represent boolean values as integersRafael Mendonça França2019-01-171-4/+0
| |
* | Merge pull request #34953 from gmcgibbon/seed_with_inline_jobsRafael França2019-01-171-1/+13
|\ \ | | | | | | Seed database with inline ActiveJob job adapter
| * | Seed database with inline ActiveJob job adapterGannon McGibbon2019-01-171-1/+13
| | |
* | | Merge pull request #33419 from bogdanvlviv/update-active_storageGeorge Claghorn2019-01-162-1/+12
|\ \ \ | | | | | | | | `rake app:update` should update active_storage
| * | | Add foreign key to active_storage_attachments for `blob_id` via new migrationbogdanvlviv2019-01-162-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need this in order to be able to add this migration for users that use ActiveStorage during update their apps from Rails 5.2 to Rails 6.0. Related to #33405 `rake app:update` should update active_storage `rake app:update` should execute `rake active_storage:update` if it is used in the app that is being updated. It will add new active_storage's migrations to users' apps during update Rails. Context https://github.com/rails/rails/pull/33405#discussion_r204239399 Also, see a related discussion in the Campfire: https://3.basecamp.com/3076981/buckets/24956/chats/12416418@1236713081
* | | | Add a space in framework names. Matches Active Record in generated Gemfile.Kasper Timm Hansen2019-01-161-2/+2
| | | |
* | | | Minimize boilerplate setup code for JavaScript librariesJavan Makhmali2019-01-162-12/+6
| |/ / |/| |
* | | Merge branch 'master' into db_system_change_commandKasper Timm Hansen2019-01-1619-61/+83
|\ \ \
| * | | Add `rails test:channels`.bogdanvlviv2019-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | Add this rake task to test channels only. We've added `rails test:mailboxes` recently in the same way #34828.
| * | | Remove `frozen_string_literal` from Action Cable's template filesbogdanvlviv2019-01-161-2/+0
| |/ / | | | | | | | | | | | | | | | Related to 837f602fa1b3281113dac965a8ef96de3cac8b02 Fix the testing guide.
| * | Merge pull request #33962 from kaspth/restructure-environment-credentialsKasper Timm Hansen2019-01-143-42/+51
| |\ \ | | | | | | | | Restructure credentials after environment overrides.
| | * | Restructure credentials after environment overrides.Kasper Timm Hansen2019-01-143-42/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to: e0d3313 - Revert renames from `encrypted` and `encrypted_file` back to `credentials`. They might be using our Encrypted* generators but from that level of abstraction they're still about credentials. - Same vein: extract a `credentials` method for the `encrypted` local variable. But don't call it `encrypted` just because it uses that under the hood. It's about capturing the credentials. It's also useful in `change_credentials_in_system_editor`. - Remove lots of needless argument passing. We've abstracted content_path and key_path into methods for a reason, so they should be used. Also spares a conspicuous rename of content_path into file_path in other methods. - Reorders private methods so they're grouped into: command building blocks, option parsers, and the generators. - Extracts commonality in the credentials application tests. A tad unsure about this. But I do like that we go with key, content thus matching the command and remove the yield which isn't really needed. - Moves test/credentials_test.rb to beneath the test/application directory. It's a Rails application test, so it should be in there. - Uses `root.join` — a neat trick gleaned from the tests! — and composes the configuration private methods such that the building block is below the callers.
| * | | Add connection_test to app generatorVladimir Dementyev2019-01-132-0/+15
| |/ /
| * | Merge pull request #34913 from ↵Gannon McGibbon2019-01-111-2/+2
| |\ \ | | | | | | | | | | | | | | | | bogdanvlviv/docs_config_action_mailer_delivery_job Add info about `config.action_mailer.delivery_job` to the guide [ci skip]
| | * | Add info about `config.action_mailer.delivery_job` to the guide [ci skip]bogdanvlviv2019-01-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, add mention to `new_framework_defaults_6_0.rb` that `ActionMailer::Parameterized::DeliveryJob` is default for parameterized mail and will be removed. Related to #34692
| * | | Replace `secrets` with `credentials` in commentsokuramasafumi2019-01-119-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In comments in templates for `config/database.yml`, there is a reference to `secrets.yml` which is now deprecated. They should be replaced with `credentials.yml` so that everyone using latest Rails can understand.
| * | | Move all npm packages to @rails scopeJavan Makhmali2019-01-103-7/+7
| |/ / | | | | | | | | | Fixes #33083
* | | Revise wording on invalid database error messagesGannon McGibbon2019-01-092-2/+2
| | |
* | | Add rails db:system:change commandGannon McGibbon2019-01-093-0/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `rails db:system:change` command for changing databases. ``` bin/rails db:system:change --to=postgresql force config/database.yml gsub Gemfile ``` The change command copies a template `config/database.yml` with the target database adapter into your app, and replaces your database gem with the target database gem.
* | | Move application generator naming and database code to concernsGannon McGibbon2019-01-095-87/+111
|/ /
* | Merge pull request #34692 from gmcgibbon/use_mail_delivery_job_in_6.0_defaultsRafael França2019-01-092-0/+13
|\ \ | | | | | | Move MailDeliveryJob default to 6.0 defaults
| * | Move MailDeliveryJob default to 6.0 defaultsGannon McGibbon2019-01-072-0/+13
| | |
* | | Enable `Lint/UselessAssignment` cop to avoid unused variable warnings (#34904)Ryuta Kamizono2019-01-092-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Enable `Lint/UselessAssignment` cop to avoid unused variable warnings Since we've addressed the warning "assigned but unused variable" frequently. 370537de05092aeea552146b42042833212a1acc 3040446cece8e7a6d9e29219e636e13f180a1e03 5ed618e192e9788094bd92c51255dda1c4fd0eae 76ebafe594fc23abc3764acc7a3758ca473799e5 And also, I've found the unused args in c1b14ad which raises no warnings by the cop, it shows the value of the cop.
* | | Preserve Bundle configuration during app generation (#34755)Marco Costa2019-01-091-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating a new rails application (rails new) using a custom template that includes gems from an authenticated source, the user has to provide credentials to bundler. One way to do this is by exporting environment variables, for example: export BUNDLE_GITHUB__COM=user:pass: provides credentials for bundler to fetch gems from github.com. The problem this PR addresses is that we are currently scrubs all /BUNDLE_.*/ environment variables by wrapping our system calls in Bundler.with_clean_env. We do this because we don't want our commands executed against the generated project to use the generator's bundler environment (e.g. our gems): the generated project should use it's own configuration. The problem with Bundler.with_clean_env is that, on top of restoring environment variables to their original state, it also scrubs any /BUNDLE_.*/ variables, which is harmful for authenticated gem sources. This PR replaces Bundler.with_clean_env with Bundler.with_original_env, which only restores environment variables to their initial state, without additional scrubbing.
* | | Revert "Merge pull request #34387 from yhirano55/rails_info_properties_json"Kasper Timm Hansen2019-01-082-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had a discussion on the Core team and we don't want to expose this information as a JSON endpoint and not by default. It doesn't make sense to expose this JSON locally and this controller is only accessible in dev, so the proposed access from a production app seems off. This reverts commit 8eaffe7e89719ac62ff29c2e4208cfbeb1cd1c38, reversing changes made to 133e0ba33db5887b047c9ac8233e5b414657bca5.
* | | Revert "Revert "Merge pull request #34387 from ↵Kasper Timm Hansen2019-01-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | yhirano55/rails_info_properties_json"" I reverted the wrong commit. Damn it. This reverts commit f66a977fc7ae30d2a07124ad91924c4ee638a703.
* | | Revert "Merge pull request #34387 from yhirano55/rails_info_properties_json"Kasper Timm Hansen2019-01-081-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had a discussion on the Core team and we don't want to expose this information as a JSON endpoint and not by default. It doesn't make sense to expose this JSON locally and this controller is only accessible in dev, so the proposed access from a production app seems off. This reverts commit 8eaffe7e89719ac62ff29c2e4208cfbeb1cd1c38, reversing changes made to b6e4305c3bca4c673996d0af9db0f4cfbf50215e.
* | | Merge pull request #34132 from ConfusedVorlon/enable_fragment_cache_log_in_devRafael França2019-01-081-0/+1
|\ \ \ | |/ / |/| | enable_fragment_cache_logging in dev by default