From 6f232aa46e1ef511372006279a87c875fd5934f2 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Tue, 5 Nov 2024 00:59:38 +0800 Subject: [PATCH] Update panel_task.py --- panel_task.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/panel_task.py b/panel_task.py index 8022b403a..da7f96d7b 100755 --- a/panel_task.py +++ b/panel_task.py @@ -37,6 +37,15 @@ def execShell(cmdstring, cwd=None, timeout=None, shell=True): cmd = cmdstring + ' > ' + g_log_file + ' 2>&1' return mw.execShell(cmd) +def writeLogs(data): + # 写输出日志 + try: + fp = open(g_log_file, 'w+') + fp.write(data) + fp.close() + except: + pass + def mw_async(f): def wrapper(*args, **kwargs): thr = threading.Thread(target=f, args=args, kwargs=kwargs) @@ -72,7 +81,6 @@ def downloadFile(url, filename): writeLogs(str(e)) return True - def downloadHook(count, blockSize, totalSize): # 下载文件进度回调 global pre @@ -83,17 +91,6 @@ def downloadHook(count, blockSize, totalSize): speed = {'total': totalSize, 'used': used, 'pre': pre1} writeLogs(json.dumps(speed)) - -def writeLogs(data): - # 写输出日志 - try: - fp = open(g_log_file, 'w+') - fp.write(data) - fp.close() - except: - pass - - def runPanelTask(): try: bash_list = thisdb.getTaskList(status=-1)