diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-11-19 22:17:26 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-11-19 22:17:26 +0000 |
| commit | 44de099efe35a51b709ae754d8c5f769da2bc753 (patch) | |
| tree | fd78bb89e4999681231dcd5b842f2a0a177c7bae /railties | |
| parent | f24ed3bf6df94405d2f2620a62be500919c30e5b (diff) | |
| download | rails-44de099efe35a51b709ae754d8c5f769da2bc753.tar.gz rails-44de099efe35a51b709ae754d8c5f769da2bc753.tar.bz2 rails-44de099efe35a51b709ae754d8c5f769da2bc753.zip | |
Restore windows compatibility
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5577 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 4 | ||||
| -rw-r--r-- | railties/lib/commands/servers/mongrel.rb | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 939c771889..453c0d9ce1 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,8 +1,6 @@ *SVN* -* Use custom mime file for script/server mongrel if config/mime.yml exists. Pass --mime=other/path for a custom mime file. [Rick Olson] - -* Add custom mime type file for mongrel. config/mime.yml is added with generated apps from the rails command. [Rick Olson] +* Made script/server work with -e and -d when using Mongrel [DHH] * Update to Prototype 1.5.0_rc2 [5550] which makes it work in Opera again [Thomas Fuchs] diff --git a/railties/lib/commands/servers/mongrel.rb b/railties/lib/commands/servers/mongrel.rb index 558a5dac31..e5bde9fe1b 100644 --- a/railties/lib/commands/servers/mongrel.rb +++ b/railties/lib/commands/servers/mongrel.rb @@ -45,7 +45,11 @@ else trap(:INT) { exit } begin - `mongrel_rails start -p #{OPTIONS[:port]} -a #{OPTIONS[:ip]} -e #{OPTIONS[:environment]}` + silence_warnings do + ARGV = [ "start", "-p", OPTIONS[:port].to_s, "-a", OPTIONS[:ip].to_s, "-e", OPTIONS[:environment] ] + end + + load("mongrel_rails") ensure tail_thread.kill if tail_thread puts 'Exiting' |