diff --git a/cli.sh b/cli.sh index 83d1ab515..6c0fbf97c 100755 --- a/cli.sh +++ b/cli.sh @@ -59,8 +59,8 @@ mw_start_debug(){ if [ -f ${DIR}/data/port.pl ];then port=$(cat ${DIR}/data/port.pl) fi - # cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1 app:app - cd ${DIR}/web && gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1 app:app + cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1 app:app + # cd ${DIR}/web && gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1 app:app } mw_start_panel(){ @@ -68,8 +68,8 @@ mw_start_panel(){ if [ -f ${DIR}/data/port.pl ];then port=$(cat ${DIR}/data/port.pl) fi - # cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1 app:app - cd ${DIR}/web && gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1 app:app + cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1 app:app + # cd ${DIR}/web && gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1 app:app } diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl index 9e35c232b..b71995626 100755 --- a/scripts/init.d/mw.tpl +++ b/scripts/init.d/mw.tpl @@ -352,8 +352,8 @@ mw_debug(){ if [ -d ${PANEL_DIR}/web ];then cd ${PANEL_DIR}/web fi - gunicorn -b :$port -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1 app:app - # gunicorn -b :$port -k eventlet -w 1 app:app + # gunicorn -b :$port -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1 app:app + gunicorn -b :$port -k eventlet -w 1 app:app } diff --git a/web/admin/__init__.py b/web/admin/__init__.py index 4b95c6533..6a076d707 100644 --- a/web/admin/__init__.py +++ b/web/admin/__init__.py @@ -110,7 +110,6 @@ def requestCheck(): if not auth: return sendAuthenticated() - # print(auth.username.strip(),auth.password.strip()) salt = basic_auth['salt'] basic_user = mw.md5(auth.username.strip() + salt) basic_pwd = mw.md5(auth.password.strip() + salt) @@ -156,7 +155,9 @@ def inject_global_variables(): # socketio = SocketIO(manage_session=False, async_mode='threading', # logger=False, engineio_logger=False, debug=False, # ping_interval=25, ping_timeout=120) -socketio = SocketIO() +socketio = SocketIO(logger=True, + engineio_logger=True, + cors_allowed_origins="*") socketio.init_app(app) @socketio.on('webssh_websocketio') diff --git a/web/setting.py b/web/setting.py index fa464ed05..93d67d636 100755 --- a/web/setting.py +++ b/web/setting.py @@ -77,8 +77,8 @@ threads = workers * 1 backlog = 512 reload = False daemon = True -worker_class = 'geventwebsocket.gunicorn.workers.GeventWebSocketWorker' -# worker_class = 'eventlet' +# worker_class = 'geventwebsocket.gunicorn.workers.GeventWebSocketWorker' +worker_class = 'eventlet' timeout = 600 keepalive = 60 preload_app = True