diff --git a/web/admin/__init__.py b/web/admin/__init__.py index 0da237640..82d7fde1b 100644 --- a/web/admin/__init__.py +++ b/web/admin/__init__.py @@ -30,14 +30,16 @@ from flask_migrate import Migrate from flask_caching import Cache from werkzeug.local import LocalProxy -from admin import setup + from admin.common import isLogined import core.mw as mw import config import utils.config as utils_config import thisdb + # 初始化db +from admin import setup setup.init() # from threading import Lock @@ -77,8 +79,6 @@ try: app.config['BASIC_AUTH_OPEN'] = True except Exception as e: pass - - # 加载模块 from .submodules import get_submodules @@ -178,6 +178,7 @@ def webssh(data): shell.run(data) return + # File logging logger = logging.getLogger('werkzeug') logger.setLevel(config.CONSOLE_LOG_LEVEL) diff --git a/web/app.py b/web/app.py index a6f5f7610..273bc6179 100644 --- a/web/app.py +++ b/web/app.py @@ -17,8 +17,8 @@ import config from gevent.pywsgi import WSGIServer from geventwebsocket.handler import WebSocketHandler -# from gevent import monkey -# monkey.patch_all() +import eventlet +eventlet.monkey_patch(socket=True, select=True) if sys.version_info < (3, 6): diff --git a/web/setting.py b/web/setting.py index 500849760..82827b9f3 100755 --- a/web/setting.py +++ b/web/setting.py @@ -23,6 +23,10 @@ import core.mw as mw import utils.system as system import thisdb +# 初始化db +from admin import setup +setup.init() + cpu_info = system.getCpuInfo() workers = cpu_info[1] @@ -73,7 +77,7 @@ if workers > 2: threads = workers * 1 backlog = 512 reload = False -daemon = True +daemon = False # worker_class = 'geventwebsocket.gunicorn.workers.GeventWebSocketWorker' worker_class = 'eventlet' timeout = 600 diff --git a/web/thisdb/init.py b/web/thisdb/init.py index 1f6050df9..20654721b 100644 --- a/web/thisdb/init.py +++ b/web/thisdb/init.py @@ -14,9 +14,9 @@ import core.mw as mw def initPanelData(): - # _dbfile = mw.getPanelDataDir() + '/panel.db' - # if os.path.exists(_dbfile): - # return True + _dbfile = mw.getPanelDataDir() + '/panel.db' + if os.path.exists(_dbfile): + return True sql_file = mw.getPanelDir() + '/web/admin/setup/sql/default.sql' sql = mw.M().dbPos(mw.getPanelDataDir(),'panel') content = mw.readFile(sql_file)