Changeset 5654
- Timestamp:
- 11/30/06 22:22:02 (2 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/1-2-pre-release/railties/lib/commands/servers/mongrel.rb
r5652 r5654 33 33 puts "=> Rails application starting on http://#{OPTIONS[:ip]}:#{OPTIONS[:port]}" 34 34 35 parameters = [ 36 "start", 37 "-p", OPTIONS[:port].to_s, 38 "-a", OPTIONS[:ip].to_s, 39 "-e", OPTIONS[:environment], 40 "-P", "#{RAILS_ROOT}/tmp/pids/mongrel.pid" 41 ] 42 35 43 if OPTIONS[:detach] 36 `mongrel_rails start -d -p #{OPTIONS[:port]} -a #{OPTIONS[:ip]} -e #{OPTIONS[:environment]} -P #{RAILS_ROOT}/tmp/pids/mongrel.pid`44 `mongrel_rails #{parameters.join(" ")} -d` 37 45 else 38 46 ENV["RAILS_ENV"] = OPTIONS[:environment] … … 44 52 puts "=> Call with -d to detach" 45 53 puts "=> Ctrl-C to shutdown server" 46 tail_thread = tail(Pathname.new("#{ RAILS_ROOT}/log/#{RAILS_ENV}.log").cleanpath)54 tail_thread = tail(Pathname.new("#{File.expand_path(RAILS_ROOT)}/log/#{RAILS_ENV}.log").cleanpath) 47 55 48 56 trap(:INT) { exit } 49 57 50 58 begin 51 silence_warnings do 52 ARGV = [ "start", "-p", OPTIONS[:port].to_s, "-a", OPTIONS[:ip].to_s, "-e", OPTIONS[:environment] ] 53 end 54 59 silence_warnings { ARGV = parameters } 55 60 load("mongrel_rails") 56 61 ensure trunk/railties/lib/commands/servers/mongrel.rb
r5652 r5654 33 33 puts "=> Rails application starting on http://#{OPTIONS[:ip]}:#{OPTIONS[:port]}" 34 34 35 parameters = [ 36 "start", 37 "-p", OPTIONS[:port].to_s, 38 "-a", OPTIONS[:ip].to_s, 39 "-e", OPTIONS[:environment], 40 "-P", "#{RAILS_ROOT}/tmp/pids/mongrel.pid" 41 ] 42 35 43 if OPTIONS[:detach] 36 `mongrel_rails start -d -p #{OPTIONS[:port]} -a #{OPTIONS[:ip]} -e #{OPTIONS[:environment]} -P #{RAILS_ROOT}/tmp/pids/mongrel.pid`44 `mongrel_rails #{parameters.join(" ")} -d` 37 45 else 38 46 ENV["RAILS_ENV"] = OPTIONS[:environment] … … 44 52 puts "=> Call with -d to detach" 45 53 puts "=> Ctrl-C to shutdown server" 46 tail_thread = tail(Pathname.new("#{ RAILS_ROOT}/log/#{RAILS_ENV}.log").cleanpath)54 tail_thread = tail(Pathname.new("#{File.expand_path(RAILS_ROOT)}/log/#{RAILS_ENV}.log").cleanpath) 47 55 48 56 trap(:INT) { exit } 49 57 50 58 begin 51 silence_warnings do 52 ARGV = [ "start", "-p", OPTIONS[:port].to_s, "-a", OPTIONS[:ip].to_s, "-e", OPTIONS[:environment] ] 53 end 54 59 silence_warnings { ARGV = parameters } 55 60 load("mongrel_rails") 56 61 ensure
