tqt/Ghost
2
1
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2023-12-13 21:00:40 +01:00
Code Issues 1 Releases Wiki Activity

Fixed partial email batch/recipient records when email creation fails

Browse source 
no issue

- wrap email batch/recipient record creation in a transaction so if an error occurs during creation we're not left with a partially created batch/recipient set in the database
This commit is contained in:
Kevin Ansfield 2020-10-02 13:47:14 +01:00
parent 0f30b9f6a0
commit b5ffb38726
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
core/server/services/mega/mega.js
View file

@ -201,7 +201,7 @@ async function pendingEmailHandler(emailModel, options) {
return;
}
return jobService.addJob(sendEmailJob, {emailModel, options});
return jobService.addJob(sendEmailJob, {emailModel});
}
async function sendEmailJob({emailModel, options}) {
@ -213,9 +213,14 @@ async function sendEmailJob({emailModel, options}) {
await membersService.checkHostLimit();
// Create email batch and recipient rows unless this is a retry and they already exist
const existingBatchCount = await emailModel.related('emailBatches').count();
const existingBatchCount = await emailModel.related('emailBatches').count('id');
if (existingBatchCount === 0) {
const newBatchCount = await createEmailBatches({emailModel, options});
let newBatchCount;
await models.Base.transaction(async (transacting) => {
newBatchCount = await createEmailBatches({emailModel, options: {transacting}});
});
if (newBatchCount === 0) {
return;
@ -306,7 +311,13 @@ async function createEmailBatches({emailModel, options}) {
});
});
await db.knex('email_recipients').insert(recipientData);
const insertQuery = db.knex('email_recipients').insert(recipientData);
if (knexOptions.transacting) {
insertQuery.transacting(knexOptions.transacting);
}
await insertQuery;
return batchModel.id;
};