aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--server.ts2
-rw-r--r--server/lib/emailer.ts9
2 files changed, 5 insertions, 6 deletions
diff --git a/server.ts b/server.ts
index 8a762a905..edfbab3d7 100644
--- a/server.ts
+++ b/server.ts
@@ -249,7 +249,7 @@ async function startApplication () {
249 Emailer.Instance.init() 249 Emailer.Instance.init()
250 250
251 await Promise.all([ 251 await Promise.all([
252 Emailer.Instance.checkConnectionOrDie(), 252 Emailer.Instance.checkConnection(),
253 JobQueue.Instance.init() 253 JobQueue.Instance.init()
254 ]) 254 ])
255 255
diff --git a/server/lib/emailer.ts b/server/lib/emailer.ts
index 650a3c090..e4e093fbc 100644
--- a/server/lib/emailer.ts
+++ b/server/lib/emailer.ts
@@ -107,18 +107,18 @@ class Emailer {
107 } 107 }
108 } 108 }
109 109
110 async checkConnectionOrDie () { 110 async checkConnection () {
111 if (!this.transporter || CONFIG.SMTP.TRANSPORT !== 'smtp') return 111 if (!this.transporter || CONFIG.SMTP.TRANSPORT !== 'smtp') return
112 112
113 logger.info('Testing SMTP server...') 113 logger.info('Testing SMTP server...')
114 114
115 try { 115 try {
116 const success = await this.transporter.verify() 116 const success = await this.transporter.verify()
117 if (success !== true) this.dieOnConnectionFailure() 117 if (success !== true) this.warnOnConnectionFailure()
118 118
119 logger.info('Successfully connected to SMTP server.') 119 logger.info('Successfully connected to SMTP server.')
120 } catch (err) { 120 } catch (err) {
121 this.dieOnConnectionFailure(err) 121 this.warnOnConnectionFailure(err)
122 } 122 }
123 } 123 }
124 124
@@ -636,9 +636,8 @@ class Emailer {
636 } 636 }
637 } 637 }
638 638
639 private dieOnConnectionFailure (err?: Error) { 639 private warnOnConnectionFailure (err?: Error) {
640 logger.error('Failed to connect to SMTP %s:%d.', CONFIG.SMTP.HOSTNAME, CONFIG.SMTP.PORT, { err }) 640 logger.error('Failed to connect to SMTP %s:%d.', CONFIG.SMTP.HOSTNAME, CONFIG.SMTP.PORT, { err })
641 process.exit(-1)
642 } 641 }
643 642
644 static get Instance () { 643 static get Instance () {