Merge pull request #59 from jumpserver/dev

Dev

coco/app.py

@@ -25,7 +25,7 @@ from .utils import get_logger, register_app, register_service
 eventlet.monkey_patch()
 hub_prevent_multiple_readers(False)
 
-__version__ = '1.3.0'
+__version__ = '1.3.1'
 
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 logger = get_logger(__file__)

coco/httpd.py

@@ -167,13 +167,11 @@ class ProxyNamespace(BaseNamespace):
         secret = message.get('secret', None)
         room = self.new_room()
         self.emit('room', {'room': room["id"], 'secret': secret})
-        self.socketio.sleep(0)
         if not token or not secret:
-            logger.debug("Token or secret is None")
+            logger.debug("Token or secret is None: {}".format(token, secret))
             self.emit('data', {'data': "\nOperation not permitted!",
                                'room': room["id"]})
             self.emit('disconnect')
-            self.socketio.sleep(0)
             return None
 
         info = app_service.get_token_asset(token)
@@ -183,7 +181,6 @@ class ProxyNamespace(BaseNamespace):
             self.emit('data', {'data': "\nOperation not permitted!",
                                'room': room["id"]})
             self.emit('disconnect')
-            self.socketio.sleep(0)
             return None
 
         user_id = info.get('user', None)

coco/logger.py

@@ -49,8 +49,8 @@ def create_logger(app):
             'coco': main_setting,
             'paramiko': main_setting,
             'jms': main_setting,
-            'socket.io': main_setting,
-            'engineio': main_setting,
+            # 'socket.io': main_setting,
+            # 'engineio': main_setting,
         }
     )