From 0ccf70be5691737c8200d0f1bf01ebbb9ab6f72e Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Thu, 28 Nov 2024 00:33:08 +0800 Subject: [PATCH] update --- cli.sh | 8 ++++---- web/app.py | 7 +++++-- web/setting.py | 5 ++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/cli.sh b/cli.sh index 6c0fbf97c..83d1ab515 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/web/app.py b/web/app.py index 78a70bbcc..1f7a8a868 100644 --- a/web/app.py +++ b/web/app.py @@ -8,8 +8,6 @@ # Author: midoks # --------------------------------------------------------------------------------- -# import eventlet -# eventlet.monkey_patch() import sys import os @@ -21,6 +19,11 @@ import config # from gevent.pywsgi import WSGIServer # from geventwebsocket.handler import WebSocketHandler +from gevent import monkey +monkey.patch_all() + +from requests.packages.urllib3.util.ssl_ import create_urllib3_context +create_urllib3_context() if sys.version_info < (3, 6): raise RuntimeError('This application must be run under Python 3.6 or later.') diff --git a/web/setting.py b/web/setting.py index 84fb630df..fa464ed05 100755 --- a/web/setting.py +++ b/web/setting.py @@ -12,7 +12,6 @@ # 配置文件 # --------------------------------------------------------------------------------- - import time import sys import random @@ -78,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