pull/632/head
Mr Chen 6 months ago
parent 6f232aa46e
commit 910defe18b
  1. 40
      panel_task.py
  2. 2
      web/admin/task/__init__.py
  3. 4
      web/utils/task.py

@ -320,32 +320,32 @@ def setDaemon(t):
return t return t
def run(): def run():
# # 系统监控 # 系统监控
# sysTask = threading.Thread(target=systemTask) sysTask = threading.Thread(target=systemTask)
# sysTask = setDaemon(sysTask) sysTask = setDaemon(sysTask)
# sysTask.start() sysTask.start()
# # PHP 502错误检查线程 # PHP 502错误检查线程
# php502 = threading.Thread(target=check502Task) php502 = threading.Thread(target=check502Task)
# php502 = setDaemon(php502) php502 = setDaemon(php502)
# php502.start() php502.start()
# # OpenResty Restart At Once Start # OpenResty Restart At Once Start
# oraos = threading.Thread(target=openrestyRestartAtOnce) oraos = threading.Thread(target=openrestyRestartAtOnce)
# oraos = setDaemon(oraos) oraos = setDaemon(oraos)
# oraos.start() oraos.start()
# # OpenResty Auto Restart Start # OpenResty Auto Restart Start
# oar = threading.Thread(target=openrestyAutoRestart) oar = threading.Thread(target=openrestyAutoRestart)
# oar = setDaemon(oar) oar = setDaemon(oar)
# oar.start() oar.start()
# # Panel Restart Start # Panel Restart Start
# rps = threading.Thread(target=restartPanelService) rps = threading.Thread(target=restartPanelService)
# rps = setDaemon(rps) rps = setDaemon(rps)
# rps.start() rps.start()
# 面板后台任务 # 面板后台任务
startPanelTask() startPanelTask()

@ -35,7 +35,7 @@ def list():
p = request.form.get('p', '1') p = request.form.get('p', '1')
limit = request.form.get('limit', '10').strip() limit = request.form.get('limit', '10').strip()
search = request.form.get('search', '').strip() search = request.form.get('search', '').strip()
return MwTasks.getTaskList(int(p), int(limit)) return MwTasks.getTaskPage(int(p), int(limit))
@blueprint.route('/get_exec_log', endpoint='get_exec_log', methods=['POST']) @blueprint.route('/get_exec_log', endpoint='get_exec_log', methods=['POST'])
@panel_login_required @panel_login_required

@ -15,8 +15,8 @@ import time
import core.mw as mw import core.mw as mw
import thisdb import thisdb
def getTaskList(page=1,size=10): def getTaskPage(page=1,size=10):
info = thisdb.getTaskList(page=page, size=size) info = thisdb.getTaskPage(page=page, size=size)
rdata = {} rdata = {}
rdata['data'] = info['list'] rdata['data'] = info['list']

Loading…
Cancel
Save