# HG changeset patch
# User Mahlon E. Smith <mahlon@martini.nu>
# Date 1400783939 25200
# Node ID 5afabb9d8a2cb4bb911308a4d4ed93edbfaadedf
# Parent  6177a734f7649899e738ad72470246c7532384e2
Be more forceful with ssh children that could be hanging for various reasons.

diff -r 6177a734f764 -r 5afabb9d8a2c lib/symphony/tasks/ssh.rb
--- a/lib/symphony/tasks/ssh.rb	Fri May 16 08:28:27 2014 -0700
+++ b/lib/symphony/tasks/ssh.rb	Thu May 22 11:38:59 2014 -0700
@@ -161,7 +161,10 @@
 		status = nil
 
 	ensure
-		pid, status = Process.waitpid2( pid ) if pid
+		if pid
+			Process.kill( :TERM, pid )
+			pid, status = Process.waitpid2( pid )
+		end
 		return status
 	end