wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-06-30 08:47:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into community-pagination-

Browse Source
This commit is contained in:
Wyatt Johnson
2017-10-24 11:30:07 -06:00
committed by GitHub
parent b43b84acff 327c87cda6
commit 04540c658e
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config.js
+1 -1
View File
@@ -163,7 +163,7 @@ const CONFIG = {
SMTP_FROM_ADDRESS: process.env.TALK_SMTP_FROM_ADDRESS,
SMTP_HOST: process.env.TALK_SMTP_HOST,
SMTP_PASSWORD: process.env.TALK_SMTP_PASSWORD,
SMTP_PORT: process.env.TALK_SMTP_PORT,
SMTP_PORT: process.env.TALK_SMTP_PORT ? parseInt(process.env.TALK_SMTP_PORT) : undefined,
SMTP_USERNAME: process.env.TALK_SMTP_USERNAME,
//------------------------------------------------------------------------------
services/mailer.js
+5 -1
View File
@@ -64,7 +64,11 @@ const options = {
};
if (SMTP_PORT) {
options.port = SMTP_PORT;
try {
options.port = parseInt(SMTP_PORT);
} catch (e) {
throw new Error('TALK_SMTP_PORT is not an integer');
}
} else {
options.port = 25;
}