Pulled auto-starting browser: More pain than gain
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2987 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
7c8f3edc99
commit
9e0642a4ac
|
@ -10,8 +10,6 @@
|
|||
|
||||
* Don't detach or fork for script/server tailing [Nicholas Seckar]
|
||||
|
||||
* Added automatic browser launching on OS X when starting script/server [DHH]
|
||||
|
||||
* Changed all script/* to use #!/usr/bin/env ruby instead of hard-coded Ruby path. public/dispatcher.* still uses the hard-coded path for compatibility with web servers that don't have Ruby in path [DHH]
|
||||
|
||||
* Force RAILS_ENV to be "test" when running tests, so that ENV["RAILS_ENV"] = "production" in config/environment.rb doesn't wreck havok [DHH] #2660
|
||||
|
|
|
@ -52,6 +52,5 @@ else
|
|||
end
|
||||
|
||||
trap(:INT) { exit }
|
||||
Thread.new { sleep 0.5; `open http://0.0.0.0:#{port}` } if RUBY_PLATFORM =~ /darwin/
|
||||
`lighttpd #{!detach ? "-D " : ""}-f #{config_file}`
|
||||
tail_thread.kill if tail_thread
|
|
@ -8,8 +8,7 @@ OPTIONS = {
|
|||
:server_root => File.expand_path(RAILS_ROOT + "/public/"),
|
||||
:server_type => WEBrick::SimpleServer,
|
||||
:charset => "UTF-8",
|
||||
:mime_types => WEBrick::HTTPUtils::DefaultMimeTypes,
|
||||
:open_in_browser => true
|
||||
:mime_types => WEBrick::HTTPUtils::DefaultMimeTypes
|
||||
}
|
||||
|
||||
ARGV.options do |opts|
|
||||
|
|
|
@ -66,10 +66,6 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
|
|||
require File.join(@server_options[:server_root], "..", "config", "environment") unless defined?(RAILS_ROOT)
|
||||
require "dispatcher"
|
||||
|
||||
if options[:open_in_browser] && RUBY_PLATFORM =~ /darwin/
|
||||
Thread.new { sleep 0.5; `open http://#{options[:ip]}:#{options[:port]}` }
|
||||
end
|
||||
|
||||
server.start
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue