Skip to content
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

[FIX] Apps-Engine's scheduler failing to update run tasks #22882

Merged
merged 8 commits into from
Aug 13, 2021
Merged

[FIX] Apps-Engine's scheduler failing to update run tasks #22882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d471479
Fix apps engine's scheduler faulty tasks update
thassiov Aug 6, 2021
06d360b
Revert "Fix apps engine's scheduler faulty tasks update"
thassiov Aug 9, 2021
1c644bf
Update agenda dependency to Rocket.Chat's fork
thassiov Aug 9, 2021
06e4fa6
Restore package-lock.json
thassiov Aug 9, 2021
80c3e3c
Add correct tag reference for agenda at package.json
thassiov Aug 9, 2021
ba02f69
Merge branch 'develop' into fix/apps-engine-scheduler-update-fail
thassiov Aug 9, 2021
591e53a
Merge branch 'develop' into fix/apps-engine-scheduler-update-fail
d-gubert Aug 9, 2021
4e5bab6
Update Agenda to our fork
d-gubert Aug 11, 2021
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
8 changes: 4 additions & 4 deletions app/apps/server/bridges/scheduler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ function _callProcessor(processor: Function): (job: { attrs?: { data: object } }
// This field is for internal use, no need to leak to app processor
delete (data as any).appId;

processor(data);
return processor(data);
};
}

/**
* Provides the Apps Engine with task scheduling capabilities
* Provides the Apps Engine with task scheduling capabilities.
* It uses {@link agenda:github.com/agenda/agenda} as backend
*/
export class AppSchedulerBridge extends SchedulerBridge {
Expand All @@ -43,7 +43,7 @@ export class AppSchedulerBridge extends SchedulerBridge {
}

/**
* Entity that will be run in a job
* Entity that will be run in a job.
* @typedef {Object} Processor
* @property {string} id The processor's identifier
* @property {function} processor The function that will be run on a given schedule
Expand Down Expand Up @@ -127,7 +127,7 @@ export class AppSchedulerBridge extends SchedulerBridge {
}

/**
* Schedules a registered processor to run recurrently according to a given interval
* Schedules a registered processor to run recurrently according to a given interval.
*
* @param {Object} job
* @param {string} job.id The processor's id
Expand Down
17 changes: 8 additions & 9 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
"@slack/client": "^4.12.0",
"@types/lodash": "^4.14.171",
"adm-zip": "0.4.14",
"agenda": "^3.1.0",
"agenda": "github:RocketChat/agenda#3.1.2",
"apn": "2.2.0",
"archiver": "^3.1.1",
"arraybuffer-to-string": "^1.0.2",
Expand Down