rails_port_0.5: Merge rails_port r4664.

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index b96c1a872e79d58236b2b5b9250d2a0b0abaaef0..0d98c70bdd409fa07346ef78c793c37584fdea79 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,9 +1,15 @@
 # Be sure to restart your web server when you modify this file.
 
+# Limit each rails process to a 512Mb resident set size
+Process.setrlimit Process::RLIMIT_AS, 640*1024*1024, Process::RLIM_INFINITY
+
 # Uncomment below to force Rails into production mode when 
 # you don't control web/app server and can't set it the proper way
 ENV['RAILS_ENV'] ||= 'production'
 
+# Don't add asset tags
+ENV["RAILS_ASSET_ID"] = ''
+
 # Specifies gem version of Rails to use when vendor/rails is not present
 RAILS_GEM_VERSION = '1.2.3'
 
@@ -11,7 +17,7 @@ RAILS_GEM_VERSION = '1.2.3'
 require File.join(File.dirname(__FILE__), 'boot')
 
 # Application constants needed for routes.rb - must go before Initializer call
-API_VERSION = ENV['OSM_API_VERSION'] || '0.4'
+API_VERSION = ENV['OSM_API_VERSION'] || '0.5'
 
 # Custom logger class to format messages sensibly
 class OSMLogger < Logger
@@ -35,15 +41,23 @@ Rails::Initializer.run do |config|
 
   # Use our custom logger
   config.logger = OSMLogger.new(config.log_path)
+  config.logger.level = Logger.const_get(config.log_level.to_s.upcase)
 
   # Use the database for sessions instead of the file system
   # (create the session table with 'rake db:sessions:create')
-  # config.action_controller.session_store = :active_record_store
+  # config.action_controller.session_store = :sql_session_store
+
+  # Unfortunately SqlSessionStore is a plugin which has not been
+  # loaded yet, so we have to do things the hard way...
+  config.after_initialize do
+    ActionController::Base.session_store = :sql_session_store
+    SqlSessionStore.session_class = MysqlSession
+  end
 
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper, 
   # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
+  config.active_record.schema_format = :sql
 
   # Activate observers that should always be running
   # config.active_record.observers = :cacher, :garbage_collector
@@ -63,6 +77,10 @@ end
 #   inflect.uncountable %w( fish sheep )
 # end
 
+# Set to :readonly to put the API in read-only mode or :offline to
+# take it completely offline
+API_STATUS = :online
+
 # Include your application configuration below
 SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'
 
@@ -72,18 +90,6 @@ ActionMailer::Base.smtp_settings = {
   :domain  => 'localhost',
 } 
 
-
-# HTTP CODES
-
-# 200's
-
-HTTP_OK = 200
-
-# 400's
-
-HTTP_PRECONDITION_FAILED = 412
-HTTP_EXPECTATION_FAILED = 417
-
 #Taming FCGI
 #
 COUNT = 0