From 648b9c4520247fbd5a774dc3d891f41c79d3b8ef Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Sat, 26 Aug 2023 20:51:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=97=B6=E9=97=B4=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/schedule/addCron.ts    |  4 +---
 back/services/schedule.ts   | 12 ++++--------
 back/shared/pLimit.ts       |  4 +---
 back/shared/runCron.ts      |  6 ++----
 src/pages/setting/index.tsx |  3 ---
 5 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/back/schedule/addCron.ts b/back/schedule/addCron.ts
index dada3e52..d8265199 100644
--- a/back/schedule/addCron.ts
+++ b/back/schedule/addCron.ts
@@ -33,9 +33,7 @@ const addCron = (
       id,
       nodeSchedule.scheduleJob(id, schedule, async () => {
         Logger.info(
-          `[schedule][准备运行任务] 时间: ${dayjs().format(
-            'YYYY-MM-DD HH:mm:ss',
-          )}，运行命令: ${cmdStr}`,
+          `[schedule][准备运行任务] 命令: ${cmdStr}`,
         );
         runCron(`ID=${id} ${cmdStr}`);
       }),
diff --git a/back/services/schedule.ts b/back/services/schedule.ts
index dbb341b1..b6ff7d41 100644
--- a/back/services/schedule.ts
+++ b/back/services/schedule.ts
@@ -66,9 +66,8 @@ export default class ScheduleService {
 
           cp.stderr.on('data', async (data) => {
             this.logger.info(
-              '[执行任务失败] %s, 时间: %s, 错误信息: %j',
+              '[执行任务失败] 命令: %s, 错误信息: %j',
               command,
-              new Date().toLocaleString(),
               data.toString(),
             );
             await callbacks.onError?.(data.toString());
@@ -76,9 +75,8 @@ export default class ScheduleService {
 
           cp.on('error', async (err) => {
             this.logger.error(
-              '[创建任务失败] %s, 时间: %s, 错误信息: %j',
+              '[创建任务失败] 命令: %s, 错误信息: %j',
               command,
-              new Date().toLocaleString(),
               err,
             );
             await callbacks.onError?.(JSON.stringify(err));
@@ -101,9 +99,8 @@ export default class ScheduleService {
           });
         } catch (error) {
           await this.logger.error(
-            '[执行任务失败] 命令: %s, 时间: %s, 错误信息: %j',
+            '[执行任务失败] 命令: %s, 错误信息: %j',
             command,
-            new Date().toLocaleString(),
             error,
           );
           await callbacks.onError?.(JSON.stringify(error));
@@ -167,9 +164,8 @@ export default class ScheduleService {
       },
       (err) => {
         this.logger.error(
-          '[执行任务失败] 命令: %s, 时间: %s, 错误信息: %j',
+          '[执行任务失败] 命令: %s, 错误信息: %j',
           command,
-          new Date().toLocaleString(),
           err,
         );
       },
diff --git a/back/shared/pLimit.ts b/back/shared/pLimit.ts
index db6df149..e3841cb8 100644
--- a/back/shared/pLimit.ts
+++ b/back/shared/pLimit.ts
@@ -37,9 +37,7 @@ class TaskLimit {
 
   public runWithCpuLimit<T>(fn: () => Promise<T>): Promise<T> {
     Logger.info(
-      `[schedule][任务加入队列] 时间: ${dayjs().format(
-        'YYYY-MM-DD HH:mm:ss',
-      )}, 运行中任务数: ${this.cpuLimitActiveCount}, 等待中任务数: ${this.cpuLimitPendingCount}`,
+      `[schedule][任务加入队列] 运行中任务数: ${this.cpuLimitActiveCount}, 等待中任务数: ${this.cpuLimitPendingCount}`,
     );
     return this.cpuLimit(fn);
   }
diff --git a/back/shared/runCron.ts b/back/shared/runCron.ts
index c6fdbde6..a1cdaaa2 100644
--- a/back/shared/runCron.ts
+++ b/back/shared/runCron.ts
@@ -11,17 +11,15 @@ export function runCron(cmd: string): Promise<number> {
 
       cp.stderr.on('data', (data) => {
         Logger.info(
-          '[schedule][执行任务失败] %s, 时间: %s, 错误信息: %j',
+          '[schedule][执行任务失败] 命令: %s, 错误信息: %j',
           cmd,
-          new Date().toLocaleString(),
           data.toString(),
         );
       });
       cp.on('error', (err) => {
         Logger.error(
-          '[schedule][创建任务失败] %s, 时间: %s, 错误信息: %j',
+          '[schedule][创建任务失败] 命令: %s, 错误信息: %j',
           cmd,
-          new Date().toLocaleString(),
           err,
         );
       });
diff --git a/src/pages/setting/index.tsx b/src/pages/setting/index.tsx
index c349309a..2caf0a98 100644
--- a/src/pages/setting/index.tsx
+++ b/src/pages/setting/index.tsx
@@ -252,9 +252,6 @@ const Setting = () => {
       })
       .then(async (res) => {
         setSystemLogData(await res.text());
-        setTimeout(() => {
-          getSystemLog();
-        }, 5000);
       })
       .catch((error: any) => {
         console.log(error);