open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2025-05-23 14:56:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复获取任务日志路径

Browse Source
This commit is contained in:
whyour 2022-03-30 10:51:31 +08:00
parent 24f33431de
commit 85facc039a
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
back/services/cron.ts
View File

@ -9,6 +9,7 @@ import { getFileContentByName, concurrentRun, fileExist } from '../config/util';
import { promises, existsSync } from 'fs'; import { promises, existsSync } from 'fs';
import { promisify } from 'util'; import { promisify } from 'util';
import { Op } from 'sequelize'; import { Op } from 'sequelize';
import path from 'path';
@Service() @Service()
export default class CronService { export default class CronService {
@ -16,7 +17,7 @@ export default class CronService {
private isSixCron(cron: Crontab) { private isSixCron(cron: Crontab) {
const { schedule } = cron; const { schedule } = cron;
if (schedule.split(/ +/).length === 6) { if (schedule?.split(/ +/).length === 6) {
return true; return true;
} }
return false; return false;
@ -194,11 +195,15 @@ export default class CronService {
} }
} }
const err = await this.killTask(doc.command); const err = await this.killTask(doc.command);
const logFileExist = await fileExist(doc.log_path); const absolutePath = path.join(
config.logPath,
`${doc.log_path?.replace(config.logPath, '')}`,
);
const logFileExist = await fileExist(absolutePath);
if (doc.log_path && logFileExist) { if (doc.log_path && logFileExist) {
const str = err ? `\n${err}` : ''; const str = err ? `\n${err}` : '';
fs.appendFileSync( fs.appendFileSync(
`${doc.log_path}`, `${absolutePath}`,
`${str}\n## 执行结束... ${new Date() `${str}\n## 执行结束... ${new Date()
.toLocaleString('zh', { hour12: false }) .toLocaleString('zh', { hour12: false })
.replace(' 24:', ' 00:')} `, .replace(' 24:', ' 00:')} `,
@ -256,6 +261,11 @@ export default class CronService {
} }
let { id, command, log_path } = cron; let { id, command, log_path } = cron;
const absolutePath = path.join(
config.logPath,
`${log_path?.replace(config.logPath, '')}`,
);
const logFileExist = await fileExist(absolutePath);
this.logger.silly('Running job'); this.logger.silly('Running job');
this.logger.silly('ID: ' + id); this.logger.silly('ID: ' + id);
@ -276,13 +286,13 @@ export default class CronService {
{ where: { id } }, { where: { id } },
); );
cp.stderr.on('data', (data) => { cp.stderr.on('data', (data) => {
if (log_path) { if (logFileExist) {
fs.appendFileSync(`${log_path}`, `${data}`); fs.appendFileSync(`${absolutePath}`, `${data}`);
} }
}); });
cp.on('error', (err) => { cp.on('error', (err) => {
if (log_path) { if (logFileExist) {
fs.appendFileSync(`${log_path}`, `${JSON.stringify(err)}`); fs.appendFileSync(`${absolutePath}`, `${JSON.stringify(err)}`);
} }
}); });
@ -323,8 +333,13 @@ export default class CronService {
return ''; return '';
} }
if (doc.log_path) { const absolutePath = path.join(
return getFileContentByName(`${doc.log_path}`); config.logPath,
`${doc.log_path?.replace(config.logPath, '')}`,
);
const logFileExist = await fileExist(absolutePath);
if (logFileExist) {
return getFileContentByName(`${absolutePath}`);
} }
const [, commandStr, url] = doc.command.split(/ +/); const [, commandStr, url] = doc.command.split(/ +/);
let logPath = this.getKey(commandStr); let logPath = this.getKey(commandStr);
@ -354,7 +369,9 @@ export default class CronService {
} }
if (doc.log_path) { if (doc.log_path) {
const relativeDir = `${doc.log_path.replace(/\/[^\/]\..*/, '')}`; const relativeDir = `${doc.log_path
.replace(/\/[^\/]\..*/, '')
.replace(config.logPath, '')}`;
const dir = `${config.logPath}${relativeDir}`; const dir = `${config.logPath}${relativeDir}`;
if (existsSync(dir)) { if (existsSync(dir)) {
let files = await promises.readdir(dir); let files = await promises.readdir(dir);