Merged in dev (pull request #100)

[Update] 增加异常捕捉

coco/app.py

@@ -105,7 +105,10 @@ class Coco:
     def keep_heartbeat(self):
         def func():
             while not self.stop_evt.is_set():
-                self.heartbeat()
+                try:
+                    self.heartbeat()
+                except Exception as e:
+                    logger.error("Unexpected error occur: {}".format(e))
                 time.sleep(config["HEARTBEAT_INTERVAL"])
         thread = threading.Thread(target=func)
         thread.start()
@@ -151,17 +154,20 @@ class Coco:
 
         def func():
             while not self.stop_evt.is_set():
-                sessions_copy = [s for s in Session.sessions.values()]
-                for s in sessions_copy:
-                    # Session 没有正常关闭,
-                    if s.closed_unexpected:
-                        Session.remove_session(s.id)
-                        continue
-                    # Session已正常关闭
-                    if s.closed:
-                        Session.remove_session(s)
-                    else:
-                        check_session_idle_too_long(s)
+                try:
+                    sessions_copy = [s for s in Session.sessions.values()]
+                    for s in sessions_copy:
+                        # Session 没有正常关闭,
+                        if s.closed_unexpected:
+                            Session.remove_session(s.id)
+                            continue
+                        # Session已正常关闭
+                        if s.closed:
+                            Session.remove_session(s)
+                        else:
+                            check_session_idle_too_long(s)
+                except Exception as e:
+                    logger.error("Unexpected error occur: {}".format(e))
                 time.sleep(interval)
         thread = threading.Thread(target=func)
         thread.start()

coco/httpd.py

@@ -103,7 +103,10 @@ class ProxyNamespace(BaseNamespace):
         forwarder = ProxyServer(client, asset, system_user)
 
         def proxy():
-            forwarder.proxy()
+            try:
+                forwarder.proxy()
+            except Exception as e:
+                logger.error("Unexpected error occur: {}".format(e))
             self.logout(client_id, connection)
         self.socketio.start_background_task(proxy)
 

coco/sshd.py

@@ -110,7 +110,10 @@ class SSHServer:
         kind = client.request.kind
         if kind == 'session' and chan_type in supported:
             logger.info("Request type `{}:{}`, dispatch to interactive mode".format(kind, chan_type))
-            InteractiveServer(client).interact()
+            try:
+                InteractiveServer(client).interact()
+            except Exception as e:
+                logger.error("Unexpected error occur: {}".format(e))
             connection = Connection.get_connection(client.connection_id)
             connection.remove_client(client.id)
         elif chan_type == 'subsystem':