ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(plugin-workflow): fix schedule trigger number type repeat (#1475)

Browse Source
This commit is contained in:
Junyi 2023-02-20 21:48:15 +08:00 committed by GitHub
parent 6dbff4f74c
commit 1705b10b98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/plugins/workflow/src/server/triggers/schedule.ts
View File

@ -51,12 +51,12 @@ ScheduleModes.set(SCHEDULE_MODE.CONSTANT, {
} }
if (repeat) { if (repeat) {
if (typeof repeat === 'number' if (typeof repeat === 'number') {
&& repeat > this.cacheCycle const next = timestamp - (timestamp - startTime) % repeat + repeat;
&& (timestamp - startTime) % repeat > this.cacheCycle if (next <= timestamp || next > timestamp + this.cacheCycle) {
) {
return false; return false;
} }
}
if (endsOn) { if (endsOn) {
const endTime = parseDateWithoutMs(endsOn); const endTime = parseDateWithoutMs(endsOn);
@ -77,7 +77,6 @@ ScheduleModes.set(SCHEDULE_MODE.CONSTANT, {
const timestamp = now.getTime(); const timestamp = now.getTime();
// NOTE: align to second start // NOTE: align to second start
const startTime = parseDateWithoutMs(startsOn); const startTime = parseDateWithoutMs(startsOn);
if (!startTime || startTime > timestamp) { if (!startTime || startTime > timestamp) {
return; return;
} }
@ -498,7 +497,7 @@ export default class ScheduleTrigger extends Trigger {
const should = await this.shouldCache(workflow, now); const should = await this.shouldCache(workflow, now);
if (should) { if (should) {
console.log('caching schedule workflow:', workflow.id); this.plugin.app.logger.info('caching scheduled workflow will run in next minute:', workflow.id);
} }
this.setCache(workflow, !should); this.setCache(workflow, !should);