IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-27 08:47:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(smtp mailer): added timeout of 10 seconds to smpt mailer, fixes #2989

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-09-22 11:51:39 +02:00
parent 936146768f
commit e336fb3d60
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/services/notifications/mailer.go
View File

@ -12,6 +12,7 @@ import (
"net/smtp"
"os"
"strings"
"time"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/setting"
@ -66,7 +67,7 @@ func sendToSmtpServer(recipients []string, msgContent []byte) error {
tlsconfig.Certificates = []tls.Certificate{cert}
}
conn, err := net.Dial("tcp", net.JoinHostPort(host, port))
conn, err := net.DialTimeout("tcp", net.JoinHostPort(host, port), time.Second*10)
if err != nil {
return err
}