removed LOCAL from LOAD DATA INFILE

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 3c2516ec7e8a03655ae7222b52bc1e42fabc803a..0d98c70bdd409fa07346ef78c793c37584fdea79 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,5 +1,8 @@
 # Be sure to restart your web server when you modify this file.
 
 # 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'
 # 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'


@@ -14,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
 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
 
 # Custom logger class to format messages sensibly
 class OSMLogger < Logger


@@ -74,8 +77,9 @@ end
 #   inflect.uncountable %w( fish sheep )
 # end
 
 #   inflect.uncountable %w( fish sheep )
 # end
 

-# Set to true to put the API in read-only mode
-API_READONLY = false
+# 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'
 
 # Include your application configuration below
 SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'


@@ -86,18 +90,6 @@ ActionMailer::Base.smtp_settings = {
   :domain  => 'localhost',
 } 
 
   :domain  => 'localhost',
 } 
 

-
-# HTTP CODES
-
-# 200's
-
-HTTP_OK = 200
-
-# 400's
-
-HTTP_PRECONDITION_FAILED = 412
-HTTP_EXPECTATION_FAILED = 417
-

 #Taming FCGI
 #
 COUNT = 0
 #Taming FCGI
 #
 COUNT = 0