Skip to content

Close block-owned SSH sessions on nonlocal exits #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OskarEichler wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Close block-owned SSH sessions on nonlocal exits #167

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions lib/net/sftp.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,24 @@ module SFTP
# set the SFTP protocol version to be used)
def self.start(host, user, ssh_options={}, sftp_options={}, &block)
session = Net::SSH.start(host, user, ssh_options)
# We only use a single option here, but this leaves room for more later
# without breaking the external API.
version = sftp_options.fetch(:version, nil)
sftp = Net::SFTP::Session.new(session, version, &block).connect!
begin
# We only use a single option here, but this leaves room for more later
# without breaking the external API.
version = sftp_options.fetch(:version, nil)
sftp = Net::SFTP::Session.new(session, version, &block).connect!

if block_given?
sftp.loop
session.close
return nil
end
if block_given?
sftp.loop
return nil
end

sftp
sftp
rescue Object
failed = true
raise
ensure
session.close if block_given? && !failed
end
rescue Object => anything
begin
session.shutdown!
Expand Down