X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c5d1f3381dfa81b4aac2d24dd057143bafbf661c..7cf62a982aa2eab977f7dddbf0d11050d122f149:/config/environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index e7a6c91ef..b96c1a872 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -9,9 +9,16 @@ RAILS_GEM_VERSION = '1.2.3'
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 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'
+
+# 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
@@ -26,6 +33,9 @@ Rails::Initializer.run do |config|
   # (by default production uses :info, the others :debug)
   # config.log_level = :debug
 
+  # Use our custom logger
+  config.logger = OSMLogger.new(config.log_path)
+
   # 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
@@ -56,7 +66,7 @@ end
 # 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',
@@ -77,4 +87,8 @@ HTTP_EXPECTATION_FAILED = 417
 #Taming FCGI
 #
 COUNT = 0
-MAX_COUNT = 500
+MAX_COUNT = 10000
+
+
+
+