summaryrefslogtreecommitdiffstats
path: root/utils/mail.go
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-06-16 23:05:37 -0800
committer=Corey Hulen <corey@hulen.com>2015-06-16 23:05:37 -0800
commitdb2510554af79d9f1e84d31c89097992493cd6bb (patch)
tree12779d692a467b38eb719cf4dc27e845896c07e3 /utils/mail.go
parentc2f6e6a10d6f252c23176d05e4a253f53b48b493 (diff)
downloadchat-db2510554af79d9f1e84d31c89097992493cd6bb.tar.gz
chat-db2510554af79d9f1e84d31c89097992493cd6bb.tar.bz2
chat-db2510554af79d9f1e84d31c89097992493cd6bb.zip
Fixing build
Diffstat (limited to 'utils/mail.go')
-rw-r--r--utils/mail.go16
1 files changed, 10 insertions, 6 deletions
diff --git a/utils/mail.go b/utils/mail.go
index 645dcae24..bf1cc9d46 100644
--- a/utils/mail.go
+++ b/utils/mail.go
@@ -40,23 +40,27 @@ func SendMail(to, subject, body string) *model.AppError {
auth := smtp.PlainAuth("", Cfg.EmailSettings.SMTPUsername, Cfg.EmailSettings.SMTPPassword, host)
+ var conn net.Conn
+ var err error
+
if Cfg.EmailSettings.UseTLS {
tlsconfig := &tls.Config{
InsecureSkipVerify: true,
ServerName: host,
}
- conn, err := tls.Dial("tcp", Cfg.EmailSettings.SMTPServer, tlsconfig)
+ conn, err = tls.Dial("tcp", Cfg.EmailSettings.SMTPServer, tlsconfig)
if err != nil {
return model.NewAppError("SendMail", "Failed to open TLS connection", err.Error())
}
- defer conn.Close()
+ } else {
+ conn, err = net.Dial("tcp", Cfg.EmailSettings.SMTPServer)
+ if err != nil {
+ return model.NewAppError("SendMail", "Failed to open connection", err.Error())
+ }
}
- conn, err := net.Dial("tcp", Cfg.EmailSettings.SMTPServer)
- if err != nil {
- return model.NewAppError("SendMail", "Failed to open connection", err.Error())
- }
+ defer conn.Close()
c, err := smtp.NewClient(conn, host)
if err != nil {