diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2010-01-11 14:01:28 -0800 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2010-01-11 14:01:28 -0800 |
commit | 8cb594a2e1808cd7d93f3593afed0414016fc56f (patch) | |
tree | 766eeb882eb4cfd9a6a13893a7b0ca7f35811650 /railties/lib/rails/bootstrap.rb | |
parent | a9eebde8561df5c7c34669587c9e25e8baeeeabb (diff) | |
download | rails-8cb594a2e1808cd7d93f3593afed0414016fc56f.tar.gz rails-8cb594a2e1808cd7d93f3593afed0414016fc56f.tar.bz2 rails-8cb594a2e1808cd7d93f3593afed0414016fc56f.zip |
Get everyone running on Rails.env and fix the broken environment settings for script/console and script/dbconsole
Diffstat (limited to 'railties/lib/rails/bootstrap.rb')
-rw-r--r-- | railties/lib/rails/bootstrap.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/railties/lib/rails/bootstrap.rb b/railties/lib/rails/bootstrap.rb index 15d5b2b59d..3808695f10 100644 --- a/railties/lib/rails/bootstrap.rb +++ b/railties/lib/rails/bootstrap.rb @@ -38,6 +38,11 @@ module Rails config.load_once_paths.freeze end + # TODO: Wrap in deprecation warning, everyone should be using Rails.env now + initializer :set_rails_env do + silence_warnings { Object.const_set "RAILS_ENV", Rails.env } + end + # Create tmp directories initializer :ensure_tmp_directories_exist do %w(cache pids sessions sockets).each do |dir_to_make| @@ -71,7 +76,7 @@ module Rails begin logger = ActiveSupport::BufferedLogger.new(config.log_path) logger.level = ActiveSupport::BufferedLogger.const_get(config.log_level.to_s.upcase) - if RAILS_ENV == "production" + if Rails.env.production? logger.auto_flushing = false end rescue StandardError => e |