jyapayne/nimforum
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix crash when no mlist address is configured.

Browse source
This commit is contained in:
Dominik Picheta 2016-01-30 10:21:25 +00:00
commit d75c11c5eb
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
utils.nim
View file

@ -10,11 +10,11 @@ type
mlistAddress: string mlistAddress: string
proc loadConfig*(filename = getCurrentDir() / "forum.json"): Config = proc loadConfig*(filename = getCurrentDir() / "forum.json"): Config =
result = Config(smtpAddress: "localhost", smtpPort: 25, smtpUser: "", result = Config(smtpAddress: "", smtpPort: 25, smtpUser: "",
smtpPassword: "") smtpPassword: "", mlistAddress: "")
try: try:
let root = parseFile(filename) let root = parseFile(filename)
result.smtpAddress = root["smtpAddress"].getStr("localhost") result.smtpAddress = root["smtpAddress"].getStr("")
result.smtpPort = root["smtpPort"].getNum(25).int result.smtpPort = root["smtpPort"].getNum(25).int
result.smtpUser = root["smtpUser"].getStr("") result.smtpUser = root["smtpUser"].getStr("")
result.smtpPassword = root["smtpPassword"].getStr("") result.smtpPassword = root["smtpPassword"].getStr("")
@ -23,7 +23,10 @@ proc loadConfig*(filename = getCurrentDir() / "forum.json"): Config =
echo("[WARNING] Couldn't read config file: ./forum.json") echo("[WARNING] Couldn't read config file: ./forum.json")
proc sendMail(config: Config, subject, message, recipient: string, from_addr = "forum@nim-lang.org", otherHeaders:seq[(string, string)] = @[]) {.async.} = proc sendMail(config: Config, subject, message, recipient: string, from_addr = "forum@nim-lang.org", otherHeaders:seq[(string, string)] = @[]) {.async.} =
when defined(dev): return if config.smtpAddress.len == 0:
echo("[WARNING] Cannot send mail: no smtp server configured (smtpAddress).")
return
var client = newAsyncSmtp(config.smtpAddress, Port(config.smtpPort)) var client = newAsyncSmtp(config.smtpAddress, Port(config.smtpPort))
await client.connect() await client.connect()
if config.smtpUser.len > 0: if config.smtpUser.len > 0:
@ -41,7 +44,8 @@ proc sendMail(config: Config, subject, message, recipient: string, from_addr = "
proc sendMailToMailingList*(config: Config, username, user_email_addr, subject, message: string, thread_id=0, post_id=0, is_reply=false) {.async.} = proc sendMailToMailingList*(config: Config, username, user_email_addr, subject, message: string, thread_id=0, post_id=0, is_reply=false) {.async.} =
# send message to a mailing list # send message to a mailing list
if config.mlistAddress == "": if config.mlistAddress.len == 0:
echo("[WARNING] Cannot send mail: no mlistAddress configured.")
return return
let from_addr = "$# <$#>" % [username, user_email_addr] let from_addr = "$# <$#>" % [username, user_email_addr]