Set the display name correctly in the image URL.

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index e7a6c91ef8251b8ffcb5cf05da844de33540df55..45d03d2adc37f0c6658bedbb3c820d743c5c5b35 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -4,14 +4,24 @@
 # you don't control web/app server and can't set it the proper way
 ENV['RAILS_ENV'] ||= 'production'
 
 # 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'
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
 # Specifies gem version of Rails to use when vendor/rails is not present
 RAILS_GEM_VERSION = '1.2.3'
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')

-\r
-# Application constants needed for routes.rb - must go before Initializer call\r
-API_VERSION = ENV['OSM_API_VERSION'] || '0.4'\r
+
+# Application constants needed for routes.rb - must go before Initializer call
+API_VERSION = ENV['OSM_API_VERSION'] || '0.4'
+
+# Custom logger class to format messages sensibly
+class OSMLogger < Logger
+  def format_message(severity, time, progname, msg)
+    "[%s.%06d #%d] %s\n" % [time.strftime("%Y-%m-%d %H:%M:%S"), time.usec, $$, msg.sub(/^\n+/, "")]
+  end
+end

 
 Rails::Initializer.run do |config|
   # Settings in config/environments/* take precedence those specified here
 
 Rails::Initializer.run do |config|
   # Settings in config/environments/* take precedence those specified here


@@ -26,14 +36,25 @@ Rails::Initializer.run do |config|
   # (by default production uses :info, the others :debug)
   # config.log_level = :debug
 
   # (by default production uses :info, the others :debug)
   # config.log_level = :debug
 

+  # 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')
   # 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
 
   # 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
 
   # Activate observers that should always be running
   # config.active_record.observers = :cacher, :garbage_collector


@@ -53,28 +74,23 @@ 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
+

 # 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'
 

-ActionMailer::Base.server_settings = {
+ActionMailer::Base.smtp_settings = {

   :address  => "localhost",
   :port  => 25, 
   :domain  => 'localhost',
 } 
 
   :address  => "localhost",
   :port  => 25, 
   :domain  => 'localhost',
 } 
 

+#Taming FCGI
+#
+COUNT = 0
+MAX_COUNT = 10000

 
 

-# HTTP CODES
-
-# 200's
-
-HTTP_OK = 200

 
 

-# 400's

 
 

-HTTP_PRECONDITION_FAILED = 412
-HTTP_EXPECTATION_FAILED = 417

 
 

-#Taming FCGI
-#
-COUNT = 0
-MAX_COUNT = 500