Merge pull request #50 from hokadiri/master

Handling paramiko.ssh_exception.ChannelException when connecting via proxy_host

Author: pkittenis

pssh/ssh_client.py

@@ -26,6 +26,7 @@
 monkey.patch_all()
 import logging
 import paramiko
+from paramiko.ssh_exception import ChannelException as channel_exception
 import os
 from socket import gaierror as sock_gaierror, error as sock_error
 from .exceptions import UnknownHostException, AuthenticationException, \
@@ -134,11 +135,16 @@ def _connect_tunnel(self):
         self._connect(self.proxy_client, self.proxy_host, self.proxy_port)
         logger.info("Connecting via SSH proxy %s:%s -> %s:%s", self.proxy_host,
                     self.proxy_port, self.host, self.port,)
-        proxy_channel = self.proxy_client.get_transport().\
-          open_channel('direct-tcpip', (self.host, self.port,),
-                       ('127.0.0.1', 0))
-        return self._connect(self.client, self.host, self.port, sock=proxy_channel)
-        
+        try:
+          proxy_channel = self.proxy_client.get_transport().\
+            open_channel('direct-tcpip', (self.host, self.port,),
+                        ('127.0.0.1', 0))
+          return self._connect(self.client, self.host, self.port, sock=proxy_channel)
+        except channel_exception, ex:
+          error_type = ex.args[1] if len(ex.args) > 1 else ex.args[0]
+          raise ConnectionErrorException("Error connecting to host '%s:%s' - %s",
+                                           self.host, self.port,
+                                           str(error_type))
     def _connect(self, client, host, port, sock=None, retries=1):
         """Connect to host