diff --git a/back/schedule/addCron.ts b/back/schedule/addCron.ts index 15f805ee..dada3e52 100644 --- a/back/schedule/addCron.ts +++ b/back/schedule/addCron.ts @@ -33,7 +33,7 @@ const addCron = ( id, nodeSchedule.scheduleJob(id, schedule, async () => { Logger.info( - `[schedule] 时间: ${dayjs().format( + `[schedule][准备运行任务] 时间: ${dayjs().format( 'YYYY-MM-DD HH:mm:ss', )},运行命令: ${cmdStr}`, ); diff --git a/back/shared/pLimit.ts b/back/shared/pLimit.ts index 822f3d91..db6df149 100644 --- a/back/shared/pLimit.ts +++ b/back/shared/pLimit.ts @@ -1,12 +1,22 @@ import pLimit from 'p-limit'; import os from 'os'; import { AuthDataType, AuthModel } from '../data/auth'; +import Logger from '../loaders/logger'; +import dayjs from 'dayjs'; class TaskLimit { private oneLimit = pLimit(1); private updateLogLimit = pLimit(1); private cpuLimit = pLimit(Math.max(os.cpus().length, 4)); + get cpuLimitActiveCount() { + return this.cpuLimit.activeCount; + } + + get cpuLimitPendingCount() { + return this.cpuLimit.pendingCount; + } + constructor() { this.setCustomLimit(); } @@ -26,6 +36,11 @@ class TaskLimit { } public runWithCpuLimit(fn: () => Promise): Promise { + Logger.info( + `[schedule][任务加入队列] 时间: ${dayjs().format( + 'YYYY-MM-DD HH:mm:ss', + )}, 运行中任务数: ${this.cpuLimitActiveCount}, 等待中任务数: ${this.cpuLimitPendingCount}`, + ); return this.cpuLimit(fn); }