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

Chore: Fix staticcheck issues (#28854)

Browse Source 
* Chore: Fix issues reported by staticcheck

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Undo changes

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen
2020-11-05 11:57:20 +01:00
committed by GitHub
parent 9b90ff2961
commit 7897c6b7d5
24 changed files with 53 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,7 +105,7 @@ func (ns *NotificationService) createDialer() (*gomail.Dialer, error) {
if ns.Cfg.Smtp.CertFile != "" {
cert, err := tls.LoadX509KeyPair(ns.Cfg.Smtp.CertFile, ns.Cfg.Smtp.KeyFile)
if err != nil {
return nil, fmt.Errorf("Could not load cert or key file. error: %v", err)
return nil, fmt.Errorf("could not load cert or key file: %w", err)
}
tlsconfig.Certificates = []tls.Certificate{cert}
}
@@ -159,7 +159,7 @@ func (ns *NotificationService) buildEmailMessage(cmd *models.SendEmailCommand) (
subjectText, hasSubject := subjectData["value"]
if !hasSubject {
return nil, fmt.Errorf("Missing subject in Template %s", cmd.Template)
return nil, fmt.Errorf("missing subject in template %s", cmd.Template)
}
subjectTmpl, err := template.New("subject").Parse(subjectText.(string))

2
pkg/services/notifications/notifications.go
View File

@@ -63,7 +63,7 @@ func (ns *NotificationService) Init() error {
}
if !util.IsEmail(ns.Cfg.Smtp.FromAddress) {
return errors.New("Invalid email address for SMTP from_address config")
return errors.New("invalid email address for SMTP from_address config")
}
if setting.EmailCodeValidMinutes == 0 {