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

修改定时任务唯一键

Browse Source
This commit is contained in:
whyour 2022-01-30 10:11:47 +08:00
parent 74b258e1b6
commit 0914075cf6
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
back/data/cron.ts
View File

@ -49,12 +49,18 @@ export enum CrontabStatus {
interface CronInstance extends Model<Crontab, Crontab>, Crontab {} interface CronInstance extends Model<Crontab, Crontab>, Crontab {}
export const CrontabModel = sequelize.define<CronInstance>('Crontab', { export const CrontabModel = sequelize.define<CronInstance>('Crontab', {
name: DataTypes.STRING, name: {
command: { unique: 'compositeIndex',
unique: 'command', type: DataTypes.STRING,
},
command: {
unique: 'compositeIndex',
type: DataTypes.STRING,
},
schedule: {
unique: 'compositeIndex',
type: DataTypes.STRING, type: DataTypes.STRING,
}, },
schedule: DataTypes.STRING,
timestamp: DataTypes.STRING, timestamp: DataTypes.STRING,
saved: DataTypes.BOOLEAN, saved: DataTypes.BOOLEAN,
status: DataTypes.NUMBER, status: DataTypes.NUMBER,

5
back/services/cron.ts
View File

@ -5,7 +5,7 @@ import { Crontab, CrontabModel, CrontabStatus } from '../data/cron';
import { exec, execSync, spawn } from 'child_process'; import { exec, execSync, spawn } from 'child_process';
import fs from 'fs'; import fs from 'fs';
import cron_parser from 'cron-parser'; import cron_parser from 'cron-parser';
import { getFileContentByName, concurrentRun } from '../config/util'; 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';
@ -194,7 +194,8 @@ export default class CronService {
} }
} }
const err = await this.killTask(doc.command); const err = await this.killTask(doc.command);
if (doc.log_path) { const logFileExist = await fileExist(doc.log_path);
if (doc.log_path && logFileExist) {
const str = err ? `\n${err}` : ''; const str = err ? `\n${err}` : '';
fs.appendFileSync( fs.appendFileSync(
`${doc.log_path}`, `${doc.log_path}`,