Revert "Merge pull request #125 from brainopia/master"

It appears that this is causing issues with process termination.

This reverts commit d2c9ce0f34, reversing
changes made to 98337c92e1.
This commit is contained in:
David Dollar
2012-01-15 12:59:47 -05:00
parent 83748cb538
commit 76cd2e794b
3 changed files with 3 additions and 11 deletions
+2 -2
View File
@@ -1,2 +1,2 @@
#!/usr/bin/env ruby
exec "#{ARGV.join(' ')} 2>&1"
#!/bin/sh
exec $1 2>&1
+1 -7
View File
@@ -72,16 +72,10 @@ private ######################################################################
def kill_all(signal="SIGTERM")
running_processes.each do |pid, process|
info "sending #{signal} to pid #{pid}"
kill(signal, -pid) or kill(signal, pid)
Process.kill(signal, pid) rescue Errno::ESRCH
end
end
def kill(signal, pid)
Process.kill signal, pid
rescue Errno::ESRCH
false
end
def terminate_gracefully
info "sending SIGTERM to all processes"
kill_all "SIGTERM"
-2
View File
@@ -30,13 +30,11 @@ private
def fork_with_io(command)
reader, writer = IO.pipe
pid = fork do
Process.setpgrp
trap("INT", "IGNORE")
$stdout.reopen writer
reader.close
exec Foreman.runner, replace_command_env(command)
end
Process.detach pid
[ reader, pid ]
end