Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
f907330c
Commit
f907330c
authored
Dec 15, 2016
by
bergquist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tech(mailer): improves error when grafana cannot read open cert/key file
ref #6949
parent
e3b53fe5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
+1
-1
pkg/services/notifications/mailer.go
+1
-1
No files found.
pkg/services/notifications/mailer.go
View file @
f907330c
...
@@ -94,7 +94,7 @@ func createDialer() (*gomail.Dialer, error) {
...
@@ -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
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment