diff options
| author | Jeremy Kemper <jeremykemper@gmail.com> | 2015-03-20 08:14:11 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremykemper@gmail.com> | 2015-03-20 08:14:11 -0700 |
| commit | 5154089c181e9b36753b193bd7ffb141e88232f1 (patch) | |
| tree | e72783fd1351026a4bd8847127abba222f44d118 /guides/source/initialization.md | |
| parent | a4e7a6f9d63b93fff4ba78a32a930d1f5f97da29 (diff) | |
| download | rails-5154089c181e9b36753b193bd7ffb141e88232f1.tar.gz rails-5154089c181e9b36753b193bd7ffb141e88232f1.tar.bz2 rails-5154089c181e9b36753b193bd7ffb141e88232f1.zip | |
Revert "Merge pull request #19404 from dmathieu/remove_rack_env"
Preserving RACK_ENV behavior.
This reverts commit 7bdc7635b885e473f6a577264fd8efad1c02174f, reversing
changes made to 45786be516e13d55a1fca9a4abaddd5781209103.
Diffstat (limited to 'guides/source/initialization.md')
| -rw-r--r-- | guides/source/initialization.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/guides/source/initialization.md b/guides/source/initialization.md index 43f15d1551..8fbb234698 100644 --- a/guides/source/initialization.md +++ b/guides/source/initialization.md @@ -278,7 +278,7 @@ def parse_options(args) options.merge! opt_parser.parse!(args) options[:config] = ::File.expand_path(options[:config]) - ENV["RAILS_ENV"] = options[:environment] + ENV["RACK_ENV"] = options[:environment] options end ``` @@ -287,7 +287,7 @@ With the `default_options` set to this: ```ruby def default_options - environment = ENV['RAILS_ENV'] || 'development' + environment = ENV['RACK_ENV'] || 'development' default_host = environment == 'development' ? 'localhost' : '0.0.0.0' { @@ -669,7 +669,7 @@ def self.run(app, options = {}) end if options[:environment] - ENV['RAILS_ENV'] = options[:environment].to_s + ENV['RACK_ENV'] = options[:environment].to_s end server = ::Puma::Server.new(app) @@ -677,7 +677,7 @@ def self.run(app, options = {}) puts "Puma #{::Puma::Const::PUMA_VERSION} starting..." puts "* Min threads: #{min}, max threads: #{max}" - puts "* Environment: #{ENV['RAILS_ENV']}" + puts "* Environment: #{ENV['RACK_ENV']}" puts "* Listening on tcp://#{options[:Host]}:#{options[:Port]}" server.add_tcp_listener options[:Host], options[:Port] |