aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2008-11-30 15:06:55 -0600
committerDavid Heinemeier Hansson <david@loudthinking.com>2008-11-30 15:06:55 -0600
commit6358e6c1078cfdbdee627a4fbde1e2b0c597af35 (patch)
treeeb42a3a7c4a42c8b89e74134b609a6820431eff5
parent471f0240189fcdd2067621d51427dc09565fdc6a (diff)
downloadrails-6358e6c1078cfdbdee627a4fbde1e2b0c597af35.tar.gz
rails-6358e6c1078cfdbdee627a4fbde1e2b0c597af35.tar.bz2
rails-6358e6c1078cfdbdee627a4fbde1e2b0c597af35.zip
More organization based on priority
-rw-r--r--railties/environments/environment.rb14
-rw-r--r--railties/environments/production.rb17
2 files changed, 15 insertions, 16 deletions
diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb
index b1a0604abf..66f71e5d9b 100644
--- a/railties/environments/environment.rb
+++ b/railties/environments/environment.rb
@@ -11,9 +11,8 @@ Rails::Initializer.run do |config|
# Application configuration should go into files in config/initializers
# -- all .rb files in that directory are automatically loaded.
- # Skip frameworks you're not going to use. To use Rails without a database,
- # you must remove the Active Record framework.
- # config.frameworks -= [ :active_record, :active_resource, :action_mailer ]
+ # Add additional load paths for your own custom dirs
+ # config.load_paths += %W( #{RAILS_ROOT}/extras )
# Specify gems that this application depends on and have them installed with rake gems:install
# config.gem "bj"
@@ -25,12 +24,9 @@ Rails::Initializer.run do |config|
# :all can be used as a placeholder for all plugins not explicitly named
# config.plugins = [ :exception_notification, :ssl_requirement, :all ]
- # Add additional load paths for your own custom dirs
- # config.load_paths += %W( #{RAILS_ROOT}/extras )
-
- # Force all environments to use the same logger level
- # (by default production uses :info, the others :debug)
- # config.log_level = :debug
+ # Skip frameworks you're not going to use. To use Rails without a database,
+ # you must remove the Active Record framework.
+ # config.frameworks -= [ :active_record, :active_resource, :action_mailer ]
# Make Time.zone default to the specified zone, and make Active Record store time values
# in the database in UTC, and return them converted to the specified local zone.
diff --git a/railties/environments/production.rb b/railties/environments/production.rb
index ec5b7bc865..1fc9f6b923 100644
--- a/railties/environments/production.rb
+++ b/railties/environments/production.rb
@@ -4,21 +4,24 @@
# Code is not reloaded between requests
config.cache_classes = true
-# Enable threaded mode
-# config.threadsafe!
-
-# Use a different logger for distributed setups
-# config.logger = SyslogLogger.new
-
# Full error reports are disabled and caching is turned on
config.action_controller.consider_all_requests_local = false
config.action_controller.perform_caching = true
+# See everything in the log (default is :info)
+# config.log_level = :debug
+
+# Use a different logger for distributed setups
+# config.logger = SyslogLogger.new
+
# Use a different cache store in production
# config.cache_store = :mem_cache_store
# Enable serving of images, stylesheets, and javascripts from an asset server
-# config.action_controller.asset_host = "http://assets.example.com"
+# config.action_controller.asset_host = "http://assets.example.com"
# Disable delivery errors, bad email addresses will be ignored
# config.action_mailer.raise_delivery_errors = false
+
+# Enable threaded mode
+# config.threadsafe! \ No newline at end of file