Improve email error logging

This commit is contained in:
Chocobozzz 2024-09-05 15:43:43 +02:00
parent 853f311684
commit 99091da7c5
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 19 additions and 10 deletions

View File

@ -271,6 +271,8 @@ class Emailer {
const toEmails = arrayify(options.to)
const errors: Error[] = []
for (const to of toEmails) {
const baseOptions: SendEmailDefaultOptions = {
template: 'common',
@ -292,9 +294,22 @@ class Emailer {
// overridden/new variables given for a specific template in the payload
const sendOptions = merge(baseOptions, options)
await email.send(sendOptions)
.then(res => logger.debug('Sent email.', { res }))
.catch(err => logger.error('Error in email sender.', { err }))
try {
const res = await email.send(sendOptions)
logger.debug('Sent email.', { res })
} catch (err) {
errors.push(err)
logger.error('Error in email sender.', { err })
}
}
if (errors.length !== 0) {
const err = new Error('Some errors when sent emails') as Error & { errors: Error[] }
err.errors = errors
throw err
}
}

View File

@ -3,15 +3,9 @@ import { EmailPayload } from '@peertube/peertube-models'
import { logger } from '../../../helpers/logger.js'
import { Emailer } from '../../emailer.js'
async function processEmail (job: Job) {
export function processEmail (job: Job) {
const payload = job.data as EmailPayload
logger.info('Processing email in job %s.', job.id)
return Emailer.Instance.sendMail(payload)
}
// ---------------------------------------------------------------------------
export {
processEmail
}