Merge pull request net-ssh#422 from mfazekas/ignore-disconnect-except…

…ion-when-all-closed Ignore Net::SSH::Disconnect when all channels closed
mfazekas · Aug 14, 2016 · 82de8d1 · 82de8d1
2 parents 1455fa2 + 7ebad22
commit 82de8d1
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/net/ssh/connection/session.rb b/lib/net/ssh/connection/session.rb
@@ -120,7 +120,11 @@ def closed?
     def close
       info { "closing remaining channels (#{channels.length} open)" }
       channels.each { |id, channel| channel.close }
-      loop(0.1) { channels.any? }
+      begin
+        loop(0.1) { channels.any? }
+      rescue Net::SSH::Disconnect
+        raise unless channels.empty?
+      end
       transport.close
     end