IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Notification: attempt to send notifications to all given email addresses (#16881)

Browse Source 
Signed-off-by: zhulongcheng <zhulongcheng.me@gmail.com>
This commit is contained in:
zhulongcheng 2019-05-10 14:39:51 +08:00 committed by Carl Bergquist
parent f617cd8975
commit 34f6dda6e6
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@ import (
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/pkg/errors"
gomail "gopkg.in/mail.v2" gomail "gopkg.in/mail.v2"
) )
@ -23,6 +24,7 @@ func (ns *NotificationService) send(msg *Message) (int, error) {
return 0, err return 0, err
} }
var num int
for _, address := range msg.To { for _, address := range msg.To {
m := gomail.NewMessage() m := gomail.NewMessage()
m.SetHeader("From", msg.From) m.SetHeader("From", msg.From)
@ -34,12 +36,16 @@ func (ns *NotificationService) send(msg *Message) (int, error) {
m.SetBody("text/html", msg.Body) m.SetBody("text/html", msg.Body)
if err := dialer.DialAndSend(m); err != nil { e := dialer.DialAndSend(m)
return 0, err if e != nil {
err = errors.Wrapf(e, "Failed to send notification to email address: %s", address)
continue
} }
num += 1
} }
return len(msg.To), nil return num, err
} }
func (ns *NotificationService) createDialer() (*gomail.Dialer, error) { func (ns *NotificationService) createDialer() (*gomail.Dialer, error) {