public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

backend: replace /pkg/errors with errutil (#17065)

Browse Source
This commit is contained in:
Carl Bergquist
2019-05-15 12:20:17 +02:00
committed by GitHub
parent fdd421e24c
commit c55e6016bf
8 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/notifications/mailer.go
+6 -6
View File
@@ -12,9 +12,9 @@ import (
"net"
"strconv"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
"github.com/pkg/errors"
"github.com/grafana/grafana/pkg/util/errutil"
gomail "gopkg.in/mail.v2"
)
@@ -38,11 +38,11 @@ func (ns *NotificationService) send(msg *Message) (int, error) {
e := dialer.DialAndSend(m)
if e != nil {
err = errors.Wrapf(e, "Failed to send notification to email address: %s", address)
err = errutil.Wrapf(e, "Failed to send notification to email address: %s", address)
continue
}
num += 1
num++
}
return num, err
@@ -83,9 +83,9 @@ func (ns *NotificationService) createDialer() (*gomail.Dialer, error) {
return d, nil
}
func (ns *NotificationService) buildEmailMessage(cmd *m.SendEmailCommand) (*Message, error) {
func (ns *NotificationService) buildEmailMessage(cmd *models.SendEmailCommand) (*Message, error) {
if !ns.Cfg.Smtp.Enabled {
return nil, m.ErrSmtpNotEnabled
return nil, models.ErrSmtpNotEnabled
}
var buffer bytes.Buffer