diff --git a/panel_task.py b/panel_task.py index 933180432..ff94e5fcc 100755 --- a/panel_task.py +++ b/panel_task.py @@ -107,6 +107,7 @@ def runPanelTask(): downloadFile(argv[0], argv[1]) elif run_task['type'] == 'execshell': execShell(run_task['cmd']) + print(run_task) end = int(time.time()) thisdb.setTaskData(run_task['id'], end=end) thisdb.setTaskStatus(run_task['id'], 1) @@ -121,9 +122,9 @@ def startPanelTask(): try: while True: runPanelTask() - time.sleep(1) + time.sleep(5) except Exception as e: - time.sleep(10) + time.sleep(30) startPanelTask() # 网站到期处理 diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl index 79a566f59..722179492 100755 --- a/scripts/init.d/mw.tpl +++ b/scripts/init.d/mw.tpl @@ -345,7 +345,7 @@ 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 -w 1 app:app } diff --git a/web/core/db.py b/web/core/db.py index 5962ac56a..27b97ae9e 100755 --- a/web/core/db.py +++ b/web/core/db.py @@ -56,6 +56,10 @@ class Sql(): self.__DB_CONN.text_factory = bytes return True + def debug(self, debug=False): + self.__debug = debug + return self + def autoTextFactory(self): if sys.version_info[0] == 3: self.__DB_CONN.text_factory = lambda x: str(x, encoding="utf-8", errors='ignore') @@ -341,8 +345,8 @@ class Sql(): opt = opt[0:len(opt) - 1] sql = "UPDATE " + self.__DB_TABLE + " SET " + opt + self.__OPT_WHERE - # import mw - # mw.writeFile('/tmp/test.pl', sql) + if self.__debug: + print(sql, param) # 处理拼接WHERE与UPDATE参数 tmp = list(param) diff --git a/web/thisdb/tasks.py b/web/thisdb/tasks.py index f7f1b64a9..5eb895542 100644 --- a/web/thisdb/tasks.py +++ b/web/thisdb/tasks.py @@ -58,7 +58,7 @@ def getTaskList( ): start = (page - 1) * size limit = str(start) + ',' + str(size) - task_list = mw.M('tasks').where('', ()).field(__FIELD).limit(limit).order('id asc').select() + task_list = mw.M('tasks').where('status=?', (status,)).field(__FIELD).limit(limit).order('id asc').select() return task_list def getTaskPage( @@ -107,10 +107,10 @@ def getTaskRunPage( return rdata -def setTaskStatus(id, +def setTaskStatus(task_id, status: int | None = 0 ): - mw.M('tasks').where('id=?',(id,)).update({'status':status}) + mw.M('tasks').where('id=?',(task_id,)).update({'status':status}) return True def setTaskData(id,