diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-10-04 19:58:19 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-10-04 19:58:19 -0700 |
| commit | a8c8a08f1ae7099f750058ef3e168810e5ad47d8 (patch) | |
| tree | 2f7392d0efa7e32c2500b0a9d3a95e81e0e639f4 /railties/lib/rails | |
| parent | 4b33bbc80374e486467f9a7b76e34e4ab2ce0b50 (diff) | |
| parent | ab4c079536641e63ca51b6121864a75de7145256 (diff) | |
| download | rails-a8c8a08f1ae7099f750058ef3e168810e5ad47d8.tar.gz rails-a8c8a08f1ae7099f750058ef3e168810e5ad47d8.tar.bz2 rails-a8c8a08f1ae7099f750058ef3e168810e5ad47d8.zip | |
Merge pull request #7838 from guilleiguaran/extract-rack-cache
Disable Rack::Cache by default
Diffstat (limited to 'railties/lib/rails')
3 files changed, 15 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index c8a6600da9..b30e6ff615 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -297,6 +297,15 @@ module Rails error.message << ' Be sure to add rack-cache to your Gemfile' raise end + + if rack_cache == true + rack_cache = { + :metastore => "rails:/", + :entitystore => "rails:/", + :verbose => false + } + end + require "action_dispatch/http/rack_cache" middleware.use ::Rack::Cache, rack_cache end diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index f58542653c..e5aa153e29 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -10,7 +10,7 @@ source 'https://rubygems.org' <%= javascript_gemfile_entry %> # Puts a simple HTTP cache in front of your app (and gets you ready for later upgrading to nginx/varnish/squid) -gem 'rack-cache', '~> 1.2' +# gem 'rack-cache', '~> 1.2' # To use ActiveModel has_secure_password # gem 'bcrypt-ruby', '~> 3.0.0' diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt index cb3e8b123e..3629920c30 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt @@ -14,6 +14,11 @@ config.consider_all_requests_local = false config.action_controller.perform_caching = true + # Enable Rack::Cache to put a simple HTTP cache in front of your application + # Add `rack-cache` to your Gemfile before enabling this. + # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid. + # config.action_dispatch.rack_cache = true + # Disable Rails's static asset server (Apache or nginx will already do this). config.serve_static_assets = false |