Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-04-01 02:41:39 -05:00
Code Issues Activity

Refactored job statuses

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

- Without going into the model layer (schema) for a job it's hard to figure out which job statuses are available. Using an object with hard typed properties makes the code less prone to typos.
This commit is contained in:
Naz 2022-07-28 14:25:46 +01:00
parent c88dcf749b
commit ee243f9ea3
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ghost/job-manager/lib/job-manager.js
View file

@ -20,6 +20,13 @@ const worker = async (task, callback) => {
}
};
const ALL_STATUSES = {
started: 'started',
finished: 'finished',
failed: 'failed',
queued: 'queued'
};
class JobManager {
/**
* @param {Object} options
@ -56,7 +63,7 @@ class JobManager {
});
this.bree.on('worker created', (name) => {
this._jobMessageHandler({name, message: 'started'});
this._jobMessageHandler({name, message: ALL_STATUSES.started});
});
if (JobModel) {
@ -84,12 +91,12 @@ class JobManager {
async _jobMessageHandler({name, message}) {
if (this._jobsRepository && name) {
if (message === 'started') {
if (message === ALL_STATUSES.started) {
const job = await this._jobsRepository.read(name);
if (job) {
await this._jobsRepository.update(job.id, {
status: 'started',
status: ALL_STATUSES.started,
started_at: new Date()
});
}
@ -98,7 +105,7 @@ class JobManager {
if (job) {
await this._jobsRepository.update(job.id, {
status: 'finished',
status: ALL_STATUSES.finished,
finished_at: new Date()
});
}
@ -112,7 +119,7 @@ class JobManager {
if (job) {
await this._jobsRepository.update(job.id, {
status: 'failed'
status: ALL_STATUSES.failed
});
}
}
@ -176,7 +183,7 @@ class JobManager {
// distinguish between states when the job fails immediately
await this._jobMessageHandler({
name: name,
message: 'started'
message: ALL_STATUSES.started
});
if (typeof job === 'function') {
@ -225,7 +232,7 @@ class JobManager {
await this._jobsRepository.add({
name,
status: 'queued'
status: ALL_STATUSES.queued
});
this.addJob({name, job, data, offloaded});
@ -256,7 +263,7 @@ class JobManager {
name
});
if (!persistedJob || !['finished', 'failed'].includes(persistedJob.get('status'))) {
if (!persistedJob || ![ALL_STATUSES.finished, ALL_STATUSES.failed].includes(persistedJob.get('status'))) {
// NOTE: can implement exponential backoff here if that's ever needed
await setTimeoutPromise(500);