X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Femailer.ts;h=88a06cb795e25c460d3039ff5408d0bf1e0fc5be;hb=2cdf27bae6acfaa0b99bb07555edc57f48b8bc43;hp=1b905e5106a3162ff161cc318fc6c2f811009f55;hpb=376220e80e7f544808dce5324de676eed6dc6f43;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/emailer.ts b/server/lib/emailer.ts
index 1b905e510..88a06cb79 100644
--- a/server/lib/emailer.ts
+++ b/server/lib/emailer.ts
@@ -46,7 +46,7 @@ class Emailer {
         secure: CONFIG.SMTP.TLS,
         debug: CONFIG.LOG.LEVEL === 'debug',
         logger: bunyanLogger as any,
-        ignoreTLS: isTestInstance() || CONFIG.SMTP.HOSTNAME === 'localhost' || CONFIG.SMTP.HOSTNAME === '127.0.0.1',
+        ignoreTLS: CONFIG.SMTP.DISABLE_STARTTLS,
         tls,
         auth
       })
@@ -60,6 +60,8 @@ class Emailer {
   async checkConnectionOrDie () {
     if (!this.transporter) return
 
+    logger.info('Testing SMTP server...')
+
     try {
       const success = await this.transporter.verify()
       if (success !== true) this.dieOnConnectionFailure()
@@ -73,7 +75,7 @@ class Emailer {
   addForgetPasswordEmailJob (to: string, resetPasswordUrl: string) {
     const text = `Hi dear user,\n\n` +
       `It seems you forgot your password on ${CONFIG.WEBSERVER.HOST}! ` +
-      `Please follow this link to reset it: ${resetPasswordUrl}.\n\n` +
+      `Please follow this link to reset it: ${resetPasswordUrl}\n\n` +
       `If you are not the person who initiated this request, please ignore this email.\n\n` +
       `Cheers,\n` +
       `PeerTube.`
@@ -119,7 +121,7 @@ class Emailer {
   }
 
   private dieOnConnectionFailure (err?: Error) {
-    logger.error('Failed to connect to SMTP %s:%d.', CONFIG.SMTP.HOSTNAME, CONFIG.SMTP.PORT, err)
+    logger.error('Failed to connect to SMTP %s:%d.', CONFIG.SMTP.HOSTNAME, CONFIG.SMTP.PORT, { err })
     process.exit(-1)
   }