Skip to content
This repository has been archived by the owner on Aug 23, 2022. It is now read-only.

Commit

Permalink
Remove relative url configuration from script/server
Browse files Browse the repository at this point in the history
  • Loading branch information
josh committed Sep 26, 2009
1 parent 382870f commit bace497
Showing 1 changed file with 4 additions and 15 deletions.
19 changes: 4 additions & 15 deletions railties/lib/rails/commands/server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
:environment => (ENV['RAILS_ENV'] || "development").dup,
:config => RAILS_ROOT + "/config.ru",
:detach => false,
:debugger => false,
:path => nil
:debugger => false
}

ARGV.clone.options do |opts|
Expand All @@ -25,7 +24,6 @@
opts.on("-e", "--environment=name", String,
"Specifies the environment to run this server under (test/development/production).",
"Default: #{options[:environment]}") { |v| options[:environment] = v }
opts.on("-P", "--path=/path", String, "Runs Rails app mounted at a specific path.", "Default: #{options[:path]}") { |v| options[:path] = v }

opts.separator ""

Expand All @@ -44,7 +42,7 @@
end

puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}"
puts "=> Rails #{Rails.version} application starting on http://#{options[:Host]}:#{options[:Port]}#{options[:path]}"
puts "=> Rails #{Rails.version} application starting on http://#{options[:Host]}:#{options[:Port]}}"

%w(cache pids sessions sockets).each do |dir_to_make|
FileUtils.mkdir_p(File.join(RAILS_ROOT, 'tmp', dir_to_make))
Expand Down Expand Up @@ -72,20 +70,11 @@
inner_app = Object.const_get(File.basename(config, '.rb').capitalize)
end

if options[:path].nil?
map_path = "/"
else
ActionController::Base.relative_url_root = options[:path]
map_path = options[:path]
end

app = Rack::Builder.new {
use Rails::Rack::LogTailer unless options[:detach]
use Rails::Rack::Debugger if options[:debugger]
map map_path do
use Rails::Rack::Static
run inner_app
end
use Rails::Rack::Static
run inner_app
}.to_app

puts "=> Call with -d to detach"
Expand Down

0 comments on commit bace497

Please sign in to comment.