Skip to content

[FIX] Modify cancelJobByDataQuery to make it blocking #1379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bhardwajaditya wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[FIX] Modify cancelJobByDataQuery to make it blocking #1379

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions apps/meteor/app/apps/server/bridges/scheduler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,18 +226,22 @@ export class AppSchedulerBridge extends SchedulerBridge {
*
* @returns Promise<void>
*/
protected async cancelJobByDataQuery(data: object, appId: string): Promise<void> {
const dataQuery = this.getQueryFromObject('data', data);
this.orch.debugLog(`Canceling all jobs of App ${appId} matching ${JSON.stringify(dataQuery)}`);
await this.startScheduler();
const matcher = new RegExp(`_${appId}$`);
try {
await this.scheduler.cancel({ name: { $regex: matcher }, ...dataQuery });
this.orch.debugLog(`Cancelled all jobs of App ${appId} matching ${JSON.stringify(dataQuery)}`);
} catch (e) {
this.orch.debugLog(`Error in Canceling all jobs of App ${appId} matching ${JSON.stringify(dataQuery)}`);
console.error(e);
}
protected cancelJobByDataQuery(data: object, appId: string): Promise<number> {
return new Promise(async (resolve, reject) => {
const dataQuery = this.getQueryFromObject('data', data);
this.orch.debugLog(`Canceling all jobs of App ${appId} matching ${JSON.stringify(dataQuery)}`);
const matcher = new RegExp(`_${appId}$`);
try {
await this.startScheduler();
const cancel = await this.scheduler.cancel({ name: { $regex: matcher }, ...dataQuery });
this.orch.debugLog(`Cancelled all jobs of App ${appId} matching ${JSON.stringify(dataQuery)}`);
resolve(cancel);
} catch (e) {
this.orch.debugLog(`Error in Canceling all jobs of App ${appId} matching ${JSON.stringify(dataQuery)}`);
console.error(e);
reject(e);
}
});
}

public async startScheduler(): Promise<void> {
Expand Down