do not crash if SMTP server is down
just log a warning if the SMTP server is down on startup time fixes #3457
This commit is contained in:
parent
fffc7c0864
commit
75594f474a
2 changed files with 5 additions and 6 deletions
|
@ -249,7 +249,7 @@ async function startApplication () {
|
|||
Emailer.Instance.init()
|
||||
|
||||
await Promise.all([
|
||||
Emailer.Instance.checkConnectionOrDie(),
|
||||
Emailer.Instance.checkConnection(),
|
||||
JobQueue.Instance.init()
|
||||
])
|
||||
|
||||
|
|
|
@ -107,18 +107,18 @@ class Emailer {
|
|||
}
|
||||
}
|
||||
|
||||
async checkConnectionOrDie () {
|
||||
async checkConnection () {
|
||||
if (!this.transporter || CONFIG.SMTP.TRANSPORT !== 'smtp') return
|
||||
|
||||
logger.info('Testing SMTP server...')
|
||||
|
||||
try {
|
||||
const success = await this.transporter.verify()
|
||||
if (success !== true) this.dieOnConnectionFailure()
|
||||
if (success !== true) this.warnOnConnectionFailure()
|
||||
|
||||
logger.info('Successfully connected to SMTP server.')
|
||||
} catch (err) {
|
||||
this.dieOnConnectionFailure(err)
|
||||
this.warnOnConnectionFailure(err)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -636,9 +636,8 @@ class Emailer {
|
|||
}
|
||||
}
|
||||
|
||||
private dieOnConnectionFailure (err?: Error) {
|
||||
private warnOnConnectionFailure (err?: Error) {
|
||||
logger.error('Failed to connect to SMTP %s:%d.', CONFIG.SMTP.HOSTNAME, CONFIG.SMTP.PORT, { err })
|
||||
process.exit(-1)
|
||||
}
|
||||
|
||||
static get Instance () {
|
||||
|
|
Loading…
Reference in a new issue