From 5e1ef434db08eb453b2aad22342ea636d53f9157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simo=20Niemel=C3=A4?= <simo.niemela@gmail.com>
Date: Tue, 9 Feb 2010 23:21:11 +0200
Subject: [PATCH] Fix server environment

---
 railties/lib/rails/commands.rb        |    7 +++++--
 railties/lib/rails/commands/server.rb |    6 +++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb
index 991d2a0..edcdbda 100644
--- a/railties/lib/rails/commands.rb
+++ b/railties/lib/rails/commands.rb
@@ -33,10 +33,13 @@ when 'c', 'console'
   require APP_PATH
   Rails::Console.start(Rails::Application)
 when 's', 'server'
-  require APP_PATH
   require 'rails/commands/server'
+  server = Rails::Server.new
+  server.set_environment
+  
+  require APP_PATH
   Dir.chdir(Rails::Application.root)
-  Rails::Server.start
+  server.start
 when 'db', 'dbconsole'
   require 'rails/commands/dbconsole'
   require APP_PATH
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index c27214d..d125002 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -37,9 +37,13 @@ module Rails
     def opt_parser
       Options.new
     end
+    
+    def set_environment
+      ENV["RAILS_ENV"] ||= options[:environment]
+    end
 
     def start
-      ENV["RAILS_ENV"] = options[:environment]
+      set_environment
 
       puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}"
       puts "=> Rails #{Rails.version} application starting in #{Rails.env} on http://#{options[:Host]}:#{options[:Port]}"
-- 
1.6.5