NuKVM/vagrant-libvirt
3
0
Fork 0
mirror of https://github.com/vagrant-libvirt/vagrant-libvirt.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #264 from aspiers/ssh-forward-logging

Browse Source 
fix redirection of STDOUT/ERR of ssh port forwarding process (#226)
This commit is contained in:
Brian Pitts
2014-11-01 18:19:58 -05:00
parent 678b770924 1f9c7a70ce
commit 9e0f0de35e
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/vagrant-libvirt/action/forward_ports.rb
View File

@@ -118,7 +118,20 @@ module VagrantPlugins
ssh_cmd << "ssh #{options} #{params}"
@logger.debug "Forwarding port with `#{ssh_cmd}`"
spawn(ssh_cmd, [:out, :err] => '/dev/null')
log_file = ssh_forward_log_file(host_ip, host_port,
guest_ip, guest_port)
@logger.info "Logging to #{log_file}"
spawn(ssh_cmd, [:out, :err] => [log_file, 'w'])
end
def ssh_forward_log_file(host_ip, host_port, guest_ip, guest_port)
log_dir = @env[:machine].data_dir.join('logs')
log_dir.mkdir unless log_dir.directory?
File.join(
log_dir,
'ssh-forwarding-%s_%s-%s_%s.log' %
[ host_ip, host_port, guest_ip, guest_port ]
)
end
def store_ssh_pid(host_port, ssh_pid)