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

tech(mailer): improves error when grafana cannot read open cert/key file

Browse Source 
ref #6949
This commit is contained in:
bergquist
2016-12-15 08:27:21 +01:00
parent e3b53fe599
commit f907330c9e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,7 +94,7 @@ func createDialer() (*gomail.Dialer, error) {
if setting.Smtp.CertFile != "" { if setting.Smtp.CertFile != "" {
cert, err := tls.LoadX509KeyPair(setting.Smtp.CertFile, setting.Smtp.KeyFile) cert, err := tls.LoadX509KeyPair(setting.Smtp.CertFile, setting.Smtp.KeyFile)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("Could not load cert or key file. error: %v", err)
} }
tlsconfig.Certificates = []tls.Certificate{cert} tlsconfig.Certificates = []tls.Certificate{cert}
} }