修复强制停止任务

This commit is contained in:
whyour 2021-05-11 21:06:01 +08:00
parent 092222b4cb
commit 633fe7707c
2 changed files with 6 additions and 3 deletions

View File

@ -186,7 +186,10 @@ export default class CronService {
cmd.on('exit', (code: number, signal: any) => {
this.logger.silly(`cmd exit ${code}`);
this.cronDb.update({ _id }, { $set: { status: CrontabStatus.idle } });
this.cronDb.update(
{ _id },
{ $set: { status: CrontabStatus.idle }, $unset: { pid: true } },
);
fs.appendFileSync(logFile, `\n\n执行结束...`);
});

View File

@ -99,12 +99,12 @@ const Crontab = () => {
align: 'center' as const,
render: (text: string, record: any) => (
<>
{record.status === CrontabStatus.idle && (
{record.status !== CrontabStatus.disabled && !record.pid && (
<Tag icon={<ClockCircleOutlined />} color="default">
</Tag>
)}
{record.status === CrontabStatus.running && (
{record.status === CrontabStatus.running && record.pid && (
<Tag icon={<SyncOutlined spin />} color="processing">
</Tag>