glenux/vagrant-lxc-ng
glenux/vagrant-lxc-ng
1
0
Fork 0
Code Issues 2 Pull requests Packages Projects 1 Releases Wiki Activity

Properly kill redir child processes

Browse source 
Fixes #59
This commit is contained in:
Fabio Rehm 2013-04-23 07:55:37 -03:00
parent 21c998f7f1
commit 2807f88212
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/vagrant-lxc/action/clear_forwarded_ports.rb
View file

@ -15,7 +15,7 @@ module Vagrant
redir_pids.each do |pid| redir_pids.each do |pid|
next unless is_redir_pid?(pid) next unless is_redir_pid?(pid)
@logger.debug "Killing pid #{pid}" @logger.debug "Killing pid #{pid}"
system "sudo pkill -9 -P #{pid}" system "sudo pkill -TERM -P #{pid}"
end end
remove_redir_pids remove_redir_pids

6
spec/unit/action/clear_forwarded_ports_spec.rb
View file

@ -28,15 +28,15 @@ describe Vagrant::LXC::Action::ClearForwardedPorts do
context 'with a valid redir pid' do context 'with a valid redir pid' do
it 'kills known processes' do it 'kills known processes' do
subject.should have_received(:system).with("sudo pkill -9 -P #{pid}") subject.should have_received(:system).with("sudo pkill -TERM -P #{pid}")
end end
end end
context 'with an invalid pid' do context 'with an invalid pid' do
let(:pid_cmd) { 'sudo ls' } let(:pid_cmd) { 'sudo ls' }
it 'does not kill the process' do it 'does not kill the process' do
subject.should_not have_received(:system).with("sudo pkill -9 -P #{pid}") subject.should_not have_received(:system).with("sudo pkill -TERM -P #{pid}")
end end
end end
end end