diff options
| author | Simo Niemelä <simo.niemela@gmail.com> | 2010-02-09 23:21:11 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-02-10 08:14:02 +0100 |
| commit | cafe882d12d767f510d6b8ad283f49a1c02e82ad (patch) | |
| tree | 7303f558b6518393254f3dcc9533e44bccedb80e /railties/lib/rails/commands.rb | |
| parent | f337ebc308b95671ba8620a0cc56f75c4fb11e15 (diff) | |
| download | rails-cafe882d12d767f510d6b8ad283f49a1c02e82ad.tar.gz rails-cafe882d12d767f510d6b8ad283f49a1c02e82ad.tar.bz2 rails-cafe882d12d767f510d6b8ad283f49a1c02e82ad.zip | |
Fix server environment [#3877 status:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'railties/lib/rails/commands.rb')
| -rw-r--r-- | railties/lib/rails/commands.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb index 991d2a0205..6972e25b29 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' + # Initialize the server first, so environment options are set + server = Rails::Server.new + require APP_PATH + Dir.chdir(Rails::Application.root) - Rails::Server.start + server.start when 'db', 'dbconsole' require 'rails/commands/dbconsole' require APP_PATH |