Merged in dev (pull request #14)

Dev

coco/httpd.py

@@ -148,11 +148,16 @@ class SSHws(Namespace, BaseWebSocketHandler):
     def on_logout(self, connection):
         logger.debug("{} logout".format(connection))
         if connection:
-            self.clients[request.sid]["proxy"][connection].close()
-            del self.clients[request.sid]["proxy"][connection]
-            del self.clients[request.sid]["forwarder"][connection]
-            self.clients[request.sid]["client"][connection].close()
-            del self.clients[request.sid]["client"][connection]
+            if connection in self.clients[request.sid]["proxy"].keys():
+                proxy = self.clients[request.sid]["proxy"][connection]
+                del self.clients[request.sid]["proxy"][connection]
+                proxy.close()
+            if connection in self.clients[request.sid]["forwarder"].keys():
+                del self.clients[request.sid]["forwarder"][connection]
+            if connection in self.clients[request.sid]["client"].keys():
+                client = self.clients[request.sid]["client"][connection]
+                del self.clients[request.sid]["client"][connection]
+                client.close()
 
 
 class HttpServer:

coco/interactive.py

@@ -129,7 +129,7 @@ class InteractiveServer:
             self.display_asset_groups()
         elif opt.startswith("g") and opt.lstrip("g").isdigit():
             self.display_group_assets(int(opt.lstrip("g")))
-        elif opt in ['q', 'Q']:
+        elif opt in ['q', 'Q', 'exit', 'quit']:
             return self._sentinel
         elif opt in ['h', 'H']:
             self.display_banner()

coco/utils.py

@@ -163,9 +163,12 @@ class TtyIOParser(object):
 
         for d in data:
             self.stream.feed(d)
-        for line in self.screen.display:
-            if line.strip():
-                output.append(line)
+        try:
+            for line in self.screen.display:
+                if line.strip():
+                    output.append(line)
+        except IndexError:
+            pass
         self.screen.reset()
         return sep.join(output[0:-1]).strip()