github-migration/webrat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better handling for starting/stopping the server

Browse Source
This commit is contained in:
Corey Donohoe 2009-02-11 10:09:23 -07:00
parent 82eabc31ee
commit 8fbcbef180
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/webrat/selenium.rb
View File

@ -36,7 +36,8 @@ module Webrat
def self.start_app_server #:nodoc: def self.start_app_server #:nodoc:
if File.exists?('config.ru') if File.exists?('config.ru')
fork do fork do
exec 'rackup', File.expand_path(Dir.pwd + '/config.ru'), '-P', 'rack.pid' File.open('rack.pid', 'w') { |fp| fp.write Process.pid }
exec 'rackup', File.expand_path(Dir.pwd + '/config.ru')
end end
else else
system("mongrel_rails start -d --chdir='#{RAILS_ROOT}' --port=#{Webrat.configuration.application_port} --environment=#{Webrat.configuration.application_environment} --pid #{pid_file} &") system("mongrel_rails start -d --chdir='#{RAILS_ROOT}' --port=#{Webrat.configuration.application_port} --environment=#{Webrat.configuration.application_environment} --pid #{pid_file} &")
@ -46,7 +47,9 @@ module Webrat
def self.stop_app_server #:nodoc: def self.stop_app_server #:nodoc:
if File.exists?('config.ru') if File.exists?('config.ru')
system("kill -9 `cat rack.pid`") pid = File.read('rack.pid')
system("kill -9 #{pid}")
FileUtils.rm_f 'rack.pid'
else else
system "mongrel_rails stop -c #{RAILS_ROOT} --pid #{pid_file}" system "mongrel_rails stop -c #{RAILS_ROOT} --pid #{pid_file}"
end end