@whyour/qinglong 2.17.10-rc.1 → 2.17.10-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyour/qinglong",
-  "version": "2.17.10-rc.1",
+  "version": "2.17.10-rc.2",
   "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
   "repository": {
     "type": "git",

package/static/build/services/cron.js

@@ -370,7 +370,7 @@ let CronService = class CronService {
                     resolve(params);
                     return;
                 }
-                this.logger.info(`[panel][开始执行任务] 参数 ${JSON.stringify(params)}`);
+                this.logger.info(`[panel][开始执行任务] 参数: ${JSON.stringify(params)}`);
                 let { id, command, log_path } = cron;
                 const uniqPath = await (0, util_1.getUniqPath)(command, `${id}`);
                 const logTime = (0, dayjs_1.default)().format('YYYY-MM-DD-HH-mm-ss-SSS');
@@ -386,12 +386,15 @@ let CronService = class CronService {
                     await promises_1.default.appendFile(absolutePath, data.toString());
                 });
                 cp.stderr.on('data', async (data) => {
+                    this.logger.info('[panel][执行任务失败] 命令: %s, 错误信息: %j', command, data.toString());
                     await promises_1.default.appendFile(absolutePath, data.toString());
                 });
                 cp.on('error', async (err) => {
+                    this.logger.error('[panel][创建任务失败] 命令: %s, 错误信息: %j', command, err);
                     await promises_1.default.appendFile(absolutePath, JSON.stringify(err));
                 });
                 cp.on('exit', async (code) => {
+                    this.logger.info('[panel][执行任务结束] 参数: %s, 退出码: %j', JSON.stringify(params), code);
                     await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.idle, pid: undefined }, { where: { id } });
                     resolve(Object.assign(Object.assign({}, params), { pid: cp.pid, code }));
                 });

package/static/build/services/schedule.js

@@ -49,7 +49,7 @@ let ScheduleService = class ScheduleService {
         return pLimit_1.default[this.taskLimitMap[runOrigin]](others, () => {
             return new Promise(async (resolve, reject) => {
                 var _a, _b, _c;
-                this.logger.info(`[panel][开始执行任务] 参数 ${JSON.stringify(Object.assign(Object.assign({}, others), { command }))}`);
+                this.logger.info(`[panel][开始执行任务] 参数: ${JSON.stringify(Object.assign(Object.assign({}, others), { command }))}`);
                 try {
                     const startTime = (0, dayjs_1.default)();
                     await ((_a = callbacks.onBefore) === null || _a === void 0 ? void 0 : _a.call(callbacks, startTime));
@@ -72,6 +72,7 @@ let ScheduleService = class ScheduleService {
                     });
                     cp.on('exit', async (code) => {
                         var _a;
+                        this.logger.info('[panel][执行任务结束] 参数: %s, 退出码: %j', JSON.stringify(Object.assign(Object.assign({}, others), { command })), code);
                         const endTime = (0, dayjs_1.default)();
                         await ((_a = callbacks.onEnd) === null || _a === void 0 ? void 0 : _a.call(callbacks, cp, endTime, endTime.diff(startTime, 'seconds')));
                         resolve(Object.assign(Object.assign({}, others), { pid: cp.pid, code }));
@@ -126,7 +127,7 @@ let ScheduleService = class ScheduleService {
                 runOrigin,
             });
         }, (err) => {
-            this.logger.error('[执行任务失败] 命令: %s, 错误信息: %j', command, err);
+            this.logger.error('[panel][执行任务失败] 命令: %s, 错误信息: %j', command, err);
         });
         const job = new toad_scheduler_1.LongIntervalJob(Object.assign({ runImmediately: false }, schedule), task, _id);
         this.intervalSchedule.addIntervalJob(job);
@@ -141,7 +142,7 @@ let ScheduleService = class ScheduleService {
     }
     async cancelIntervalTask({ id = 0, name }) {
         const _id = this.formatId(id);
-        this.logger.info('[取消interval任务], 任务ID: %s, 任务名: %s', _id, name);
+        this.logger.info('[panel][取消interval任务], 任务ID: %s, 任务名: %s', _id, name);
         this.intervalSchedule.removeById(_id);
     }
     formatId(id) {

package/static/build/shared/runCron.js

@@ -20,6 +20,7 @@ function runCron(cmd, cron) {
             });
             cp.on('exit', async (code) => {
                 pLimit_1.default.removeQueuedCron(cron.id);
+                logger_1.default.info('[schedule][执行任务结束] 参数: %s, 退出码: %j', JSON.stringify(Object.assign(Object.assign({}, cron), { command: cmd })), code);
                 resolve(Object.assign(Object.assign({}, cron), { command: cmd, pid: cp.pid, code }));
             });
         });