TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-24 03:14:03 +03:00
Code Issues Projects Releases Wiki Activity

Added successful job run check

Browse Source 
refs https://github.com/TryGhost/Toolbox/issues/358

- Allows to check for a **successfull** job run and restart/re-add the job in case it was a failed one off job
This commit is contained in:
Naz 2022-07-28 17:51:59 +01:00
parent 3092b62e10
commit 195973eae1
3 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghost/core/core/server/services/members/service.js
View File

@ -149,7 +149,7 @@ module.exports = {
})();
const membersMigrationJobName = 'members-migrations';
if (!(await jobsService.hasExecuted(membersMigrationJobName))) {
if (!(await jobsService.hasExecutedSuccessfully(membersMigrationJobName))) {
jobsService.addOneOffJob({
name: membersMigrationJobName,
offloaded: false,

12
ghost/job-manager/lib/job-manager.js
View File

@ -239,14 +239,18 @@ class JobManager {
}
/**
* Checks if the one-off job has ever been successfully executed
* Checks if the one-off job has ever been executed successfully.
* @param {String} name one-off job name
*/
async hasExecuted(name) {
// TODO: return false if the job has failed?
async hasExecutedSuccessfully(name) {
if (this._jobsRepository) {
const persistedJob = await this._jobsRepository.read(name);
return !!persistedJob;
if (!persistedJob) {
return false;
} else {
return (persistedJob.get('status') !== ALL_STATUSES.failed);
}
} else {
return false;
}

37
ghost/job-manager/test/job-manager.test.js
View File

@ -36,6 +36,8 @@ describe('Job Manager', function () {
const jobManager = new JobManager({});
should.exist(jobManager.addJob);
should.exist(jobManager.hasExecutedSuccessfully);
should.exist(jobManager.awaitCompletion);
});
describe('Add a job', function () {
@ -513,30 +515,40 @@ describe('Job Manager', function () {
describe('Job execution progress', function () {
it('checks if job has ever been executed', async function () {
const spy = sinon.spy();
const JobModel = {
findOne: sinon.stub()
.withArgs('solovei')
.onCall(0)
.resolves(null)
.onCall(1)
.resolves(null)
.resolves({id: 'unique', name: 'solovei'}),
add: sinon.stub().resolves()
.resolves({
id: 'unique',
get: (field) => {
if (field === 'status') {
return 'finished';
}
}
})
.onCall(2)
.resolves({
id: 'unique',
get: (field) => {
if (field === 'status') {
return 'failed';
}
}
})
};
const jobManager = new JobManager({JobModel});
let executed = await jobManager.hasExecuted('solovei');
let executed = await jobManager.hasExecutedSuccessfully('solovei');
should.equal(executed, false);
await jobManager.addOneOffJob({
job: spy,
name: 'solovei'
});
assert.equal(JobModel.add.called, true);
executed = await jobManager.hasExecuted('solovei');
executed = await jobManager.hasExecutedSuccessfully('solovei');
should.equal(executed, true);
executed = await jobManager.hasExecutedSuccessfully('solovei');
should.equal(executed, false);
});
it('can wait for job completion', async function () {
@ -556,7 +568,6 @@ describe('Job Manager', function () {
.resolves(null)
.onCall(1)
.resolves(null)
.resolves({
id: 'unique',
get: () => status