Cleaned up ssh client imports. Added event loop yield before blocking to accept connections in embedded server

Author: Dan

embedded_server/embedded_server.py

@@ -41,6 +41,7 @@
 from .stub_sftp import StubSFTPServer
 from .tunnel import Tunneler
 import gevent.subprocess
+# import gipc
 
 logger = logging.getLogger("embedded_server")
 paramiko_logger = logging.getLogger('paramiko.transport')
@@ -168,6 +169,7 @@ def _handle_ssh_connection(transport, fail_auth=False,
     except Exception:
         logger.exception("Error occured starting server")
         return
+    gevent.sleep(0)
     channel = transport.accept(20)
     if not channel:
         logger.error("Could not establish channel")
@@ -206,6 +208,14 @@ def start_server(sock, fail_auth=False, ssh_exception=False,
     return gevent.spawn(listen, sock, fail_auth=fail_auth,
                         timeout=timeout, ssh_exception=ssh_exception)
 
+# def start_server_process(listen_ip, fail_auth=False, ssh_exception=False,
+#                          timeout=None):
+#     p = gipc.start_process(target=_make_sock_start_server, args=(listen_ip,),
+#                            kwargs={'fail_auth': fail_auth,
+#                                    'timeout': timeout,
+#                                    'ssh_exception': ssh_exception,})
+#     return p
+
 if __name__ == "__main__":
     logging.basicConfig()
     logger.setLevel(logging.DEBUG)

pssh/ssh_client.py

@@ -19,11 +19,7 @@
 """Package containing SSHClient class."""
 
 import sys
-if 'threading' in sys.modules:
-    del sys.modules['threading']
-import gevent
-from gevent import monkey
-monkey.patch_all()
+from gevent import sleep
 import logging
 import paramiko
 from paramiko.ssh_exception import ChannelException as channel_exception
@@ -139,7 +135,7 @@ def _connect_tunnel(self):
           proxy_channel = self.proxy_client.get_transport().\
             open_channel('direct-tcpip', (self.host, self.port,),
                         ('127.0.0.1', 0))
-          gevent.sleep(0)
+          sleep(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]
@@ -164,7 +160,7 @@ def _connect(self, client, host, port, sock=None, retries=1):
             logger.error("Could not resolve host '%s' - retry %s/%s",
                          self.host, retries, self.num_retries)
             while retries < self.num_retries:
-                gevent.sleep(5)
+                sleep(5)
                 return self._connect(client, host, port, sock=sock,
                                      retries=retries+1)
             raise UnknownHostException("Unknown host %s - %s - retry %s/%s",
@@ -174,7 +170,7 @@ def _connect(self, client, host, port, sock=None, retries=1):
             logger.error("Error connecting to host '%s:%s' - retry %s/%s",
                          self.host, self.port, retries, self.num_retries)
             while retries < self.num_retries:
-                gevent.sleep(5)
+                sleep(5)
                 return self._connect(client, host, port, sock=sock,
                                      retries=retries+1)
             error_type = ex.args[1] if len(ex.args) > 1 else ex.args[0]
@@ -231,7 +227,7 @@ def exec_command(self, command, sudo=False, user=None, **kwargs):
         logger.debug("Running command %s on %s", command, self.host)
         channel.exec_command(command, **kwargs)
         logger.debug("Command started")
-        gevent.sleep(0)
+        sleep(0)
         return channel, self.host, stdout, stderr
 
     def _read_output_buffer(self, output_buffer, prefix=''):