@@ -3,4 +3,3 @@ load "#{File.dirname(__FILE__)}/lib/cruise_control/version.rb" load "#{File.dirname(__FILE__)}/lib/cruise_control/init.rb" CruiseControl::Init.new.run - cruise @@ -27,25 +27,24 @@ module CruiseControl end def start - require "lib/platform.rb" + require File.join(File.dirname(__FILE__), '..', 'platform') Platform.running_as_daemon = ARGV.include?('-d') || ARGV.include?('--daemon') - load "./script/server" + load File.join(File.dirname(__FILE__), '..', '..', 'script', 'server') end def stop pid_file = File.join("tmp", "pids", "mongrel.pid") if File.exist?(pid_file) - require File.dirname(__FILE__) + "/../platform.rb" - Platform.safely_exec("mongrel_rails stop -P #{pid_file}") + exec "mongrel_rails stop -P #{pid_file}" end end def add - load "./script/add_project" + load File.join(File.dirname(__FILE__), '..', '..', 'script', 'add_project') end def builder - load "./script/builder" + load File.join(File.dirname(__FILE__), '..', '..', 'script', 'builder') end def version lib/cruise_control/init.rb @@ -45,7 +45,9 @@ module Platform if Kernel.respond_to?(:fork) begin pid = fork || safely_exec(command) - Process.detach(pid) if pid + + # safely exec + Process.detach(pid) pid_file = File.join(RAILS_ROOT, 'tmp', 'pids', 'builders', "#{project_name}.pid") FileUtils.mkdir_p(File.dirname(pid_file)) File.open(pid_file, "w") {|f| f.write pid } lib/platform.rb 9c5749f33f4ad23f668610534c15cc83b59dc4b0 Alexey Verkhovsky alexey.verkhovsky@gmail.com http://github.com/thoughtworks/cruisecontrol.rb/commit/004e5450d013e20bfc9729b8a6fa0089f99c6d1f 004e5450d013e20bfc9729b8a6fa0089f99c6d1f 2008-06-04T17:26:41-07:00 2008-06-04T17:26:41-07:00 minor tweaking b0a0e8f329ec6f68a0c63b431eb2967a3ec138f3 Alexey Verkhovsky alexey.verkhovsky@gmail.com