public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions 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
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/notifications/mailer.go
+2 -1
View File
@@ -12,6 +12,7 @@ import (
"net/smtp" "net/smtp"
"os" "os"
"strings" "strings"
"time"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
@@ -66,7 +67,7 @@ func sendToSmtpServer(recipients []string, msgContent []byte) error {
tlsconfig.Certificates = []tls.Certificate{cert} 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 { if err != nil {
return err return err
} }