jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

JobQueue: If job data does not parse, delete it from database 

Co-authored-by: Scott Nonnenberg <scott@signal.org>
This commit is contained in:
automated-signal 2022-05-05 15:19:28 -07:00 committed by GitHub
parent 8614638eb9
commit 307b6976ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ts/jobs/JobQueue.ts
View File

@ -93,7 +93,7 @@ export abstract class JobQueue<T> {
* takes a single number, `parseData` should throw if `data` is a number and should
* return the number otherwise.
*
* If it throws, the job will be deleted from the store and the job will not be run.
* If it throws, the job will be deleted from the database and the job will not be run.
*
* Will only be called once per job, even if `maxAttempts > 1`.
*/
@ -205,9 +205,10 @@ export abstract class JobQueue<T> {
parsedData = this.parseData(storedJob.data);
} catch (err) {
log.error(
`${this.logPrefix} failed to parse data for job ${storedJob.id}`,
`${this.logPrefix} failed to parse data for job ${storedJob.id}, created ${storedJob.timestamp}. Deleting job. Parse error:`,
Errors.toLogFormat(err)
);
await this.store.delete(storedJob.id);
reject(
new Error(
'Failed to parse job data. Was unexpected data loaded from the database?'

5
ts/test-node/jobs/JobQueue_test.ts
View File

@ -513,7 +513,7 @@ describe('JobQueue', () => {
sinon.assert.calledWithMatch(run, { data: 'valid' });
});
it('keeps jobs in the storage if parseData throws', async () => {
it('deletes jobs from storage if parseData throws', async () => {
const store = new TestJobQueueStore();
class TestQueue extends JobQueue<string> {
@ -539,9 +539,10 @@ describe('JobQueue', () => {
await (await queue.add('invalid 1')).completion.catch(noop);
await (await queue.add('invalid 2')).completion.catch(noop);
await queue.add('valid');
const datas = store.storedJobs.map(job => job.data);
assert.sameMembers(datas, ['invalid 1', 'invalid 2']);
assert.sameMembers(datas, ['valid']);
});
it('adding the job resolves AFTER inserting the job into the database', async () => {