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

Disabled autoRefresh for batch sending service to increase performance

Browse Source 
fixes https://github.com/TryGhost/Team/issues/2363
This commit is contained in:
Simon Backx 2022-12-05 12:09:30 +01:00
parent d9ed6bcdb8
commit 2519f4b20d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ghost/email-service/lib/batch-sending-service.js
View File

@ -93,7 +93,7 @@ class BatchSendingService {
status: 'submitted',
submitted_at: new Date(),
error: null
}, {patch: true});
}, {patch: true, autoRefresh: false});
} catch (e) {
logging.error(`Error sending email ${email.id}: ${e.message}`);
@ -101,7 +101,7 @@ class BatchSendingService {
await email.save({
status: 'failed',
error: e.message || 'Something went wrong while sending the email'
}, {patch: true});
}, {patch: true, autoRefresh: false});
}
}
@ -188,7 +188,7 @@ class BatchSendingService {
// between creating the email and sending it (or when the email failed initially and is retried a day later)
await email.save({
email_count: totalCount
}, {patch: true, require: false});
}, {patch: true, require: false, autoRefresh: false});
}
return batches;
}
@ -316,7 +316,7 @@ class BatchSendingService {
error_status_code: null,
error_message: null,
error_data: null
}, {patch: true, require: false});
}, {patch: true, require: false, autoRefresh: false});
succeeded = true;
} catch (err) {
logging.error(`Error sending email batch ${batch.id}`);
@ -327,13 +327,13 @@ class BatchSendingService {
error_status_code: err.statusCode,
error_message: err.message,
error_data: err.errorDetails
}, {patch: true, require: false});
}, {patch: true, require: false, autoRefresh: false});
}
// Mark as processed, even when failed
await this.#models.EmailRecipient
.where({batch_id: batch.id})
.save({processed_at: new Date()}, {patch: true, require: false});
.save({processed_at: new Date()}, {patch: true, require: false, autoRefresh: false});
return succeeded;
}
@ -375,7 +375,7 @@ class BatchSendingService {
}
await model.save({
status
}, {patch: true, transacting});
}, {patch: true, transacting, autoRefresh: false});
});
return model;
}

2
ghost/email-service/lib/email-event-storage.js
View File

@ -156,7 +156,7 @@ class EmailEventStorage {
enhanced_code: event.error.enhancedCode ?? null,
failed_at: event.timestamp,
event_id: event.id
}, {...options, patch: true});
}, {...options, patch: true, autoRefresh: false});
}
}