系统设置增加系统运行日志

back/services/cron.ts

@@ -370,7 +370,7 @@ export default class CronService {
         try {
           await killTask(doc.pid);
         } catch (error) {
-          this.logger.silly(error);
+          this.logger.error(error);
         }
       }
     }
@@ -530,7 +530,6 @@ export default class CronService {
       }
     });
 
-    this.logger.silly(crontab_string);
     fs.writeFileSync(config.crontabFile, crontab_string);
 
     execSync(`crontab ${config.crontabFile}`);

back/services/schedule.ts

@@ -66,7 +66,7 @@ export default class ScheduleService {
 
           cp.stderr.on('data', async (data) => {
             this.logger.info(
-              '[执行任务失败] %s，时间：%s, 错误信息：%j',
+              '[执行任务失败] %s, 时间: %s, 错误信息: %j',
               command,
               new Date().toLocaleString(),
               data.toString(),
@@ -76,7 +76,7 @@ export default class ScheduleService {
 
           cp.on('error', async (err) => {
             this.logger.error(
-              '[创建任务失败] %s，时间：%s, 错误信息：%j',
+              '[创建任务失败] %s, 时间: %s, 错误信息: %j',
               command,
               new Date().toLocaleString(),
               err,
@@ -86,7 +86,7 @@ export default class ScheduleService {
 
           cp.on('exit', async (code, signal) => {
             this.logger.info(
-              `[任务退出] ${command} 进程id: ${cp.pid}，退出码 ${code}`,
+              `[任务退出] ${command} 进程id: ${cp.pid}, 退出码 ${code}`,
             );
           });
 
@@ -101,7 +101,7 @@ export default class ScheduleService {
           });
         } catch (error) {
           await this.logger.error(
-            '执行任务%s失败，时间：%s, 错误信息：%j',
+            '[执行任务失败] 命令: %s, 时间: %s, 错误信息: %j',
             command,
             new Date().toLocaleString(),
             error,
@@ -119,7 +119,7 @@ export default class ScheduleService {
   ) {
     const _id = this.formatId(id);
     this.logger.info(
-      '[创建cron任务]，任务ID: %s，cron: %s，任务名: %s，执行命令: %s',
+      '[创建cron任务], 任务ID: %s, cron: %s, 任务名: %s, 执行命令: %s',
       _id,
       schedule,
       name,
@@ -140,7 +140,7 @@ export default class ScheduleService {
 
   async cancelCronTask({ id = 0, name }: ScheduleTaskType) {
     const _id = this.formatId(id);
-    this.logger.info('[取消定时任务]，任务名：%s', name);
+    this.logger.info('[取消定时任务], 任务名: %s', name);
     if (this.scheduleStacks.has(_id)) {
       this.scheduleStacks.get(_id)?.cancel();
       this.scheduleStacks.delete(_id);
@@ -155,7 +155,7 @@ export default class ScheduleService {
   ) {
     const _id = this.formatId(id);
     this.logger.info(
-      '[创建interval任务]，任务ID: %s，任务名: %s，执行命令: %s',
+      '[创建interval任务], 任务ID: %s, 任务名: %s, 执行命令: %s',
       _id,
       name,
       command,
@@ -167,7 +167,7 @@ export default class ScheduleService {
       },
       (err) => {
         this.logger.error(
-          '执行任务%s失败，时间：%s, 错误信息：%j',
+          '[执行任务失败] 命令: %s, 时间: %s, 错误信息: %j',
           command,
           new Date().toLocaleString(),
           err,
@@ -190,7 +190,7 @@ export default class ScheduleService {
 
   async cancelIntervalTask({ id = 0, name }: ScheduleTaskType) {
     const _id = this.formatId(id);
-    this.logger.info('[取消interval任务]，任务ID: %s，任务名：%s', _id, name);
+    this.logger.info('[取消interval任务], 任务ID: %s, 任务名: %s', _id, name);
     this.intervalSchedule.removeById(_id);
   }
 

back/services/subscription.ts

@@ -301,7 +301,7 @@ export default class SubscriptionService {
         try {
           await killTask(doc.pid);
         } catch (error) {
-          this.logger.silly(error);
+          this.logger.error(error);
         }
       }
       const absolutePath = await handleLogPath(doc.log_path as string);

back/services/system.ts

@@ -21,11 +21,14 @@ import {
   parseContentVersion,
   parseVersion,
   promiseExec,
+  readDirs,
 } from '../config/util';
 import { TASK_COMMAND } from '../config/const';
 import taskLimit from '../shared/pLimit';
 import tar from 'tar';
 import path from 'path';
+import fs from 'fs';
+import { sum } from 'lodash';
 
 @Service()
 export default class SystemService {
@@ -275,4 +278,29 @@ export default class SystemService {
       return { code: 400, message: error.message };
     }
   }
+
+  public async getSystemLog(res: Response) {
+    const result = readDirs(config.systemLogPath, config.systemLogPath);
+    const logs = result.reverse().filter((x) => x.title.endsWith('.log'));
+    res.set({
+      'Content-Length': sum(logs.map((x) => x.size)),
+    });
+    (function sendFiles(res, fileNames) {
+      if (fileNames.length === 0) {
+        res.end();
+        return;
+      }
+
+      const currentLog = fileNames.shift();
+      if (currentLog) {
+        const currentFileStream = fs.createReadStream(
+          path.join(config.systemLogPath, currentLog.title),
+        );
+        currentFileStream.on('end', () => {
+          sendFiles(res, fileNames);
+        });
+        currentFileStream.pipe(res, { end: false });
+      }
+    })(res, logs);
+  }
 }