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(web): Improve error message for invalid SSL configuration

Browse Source
This commit is contained in:
bergquist
2016-10-03 08:47:36 +02:00
parent 4a116ad4ad
commit 36f0bf0e1e
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/cmd/grafana-server/server.go
View File

@@ -7,6 +7,8 @@ import (
"os" "os"
"time" "time"
"gopkg.in/macaron.v1"
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
"github.com/grafana/grafana/pkg/api" "github.com/grafana/grafana/pkg/api"
@@ -89,7 +91,7 @@ func (g *GrafanaServerImpl) startHttpServer() {
case setting.HTTP: case setting.HTTP:
err = http.ListenAndServe(listenAddr, m) err = http.ListenAndServe(listenAddr, m)
case setting.HTTPS: case setting.HTTPS:
err = http.ListenAndServeTLS(listenAddr, setting.CertFile, setting.KeyFile, m) err = ListenAndServeTLS(listenAddr, setting.CertFile, setting.KeyFile, m)
default: default:
g.log.Error("Invalid protocol", "protocol", setting.Protocol) g.log.Error("Invalid protocol", "protocol", setting.Protocol)
g.Shutdown(1, "Startup failed") g.Shutdown(1, "Startup failed")
@@ -113,6 +115,26 @@ func (g *GrafanaServerImpl) Shutdown(code int, reason string) {
os.Exit(code) os.Exit(code)
} }
func ListenAndServeTLS(listenAddr, certfile, keyfile string, m *macaron.Macaron) error {
if certfile == "" {
return fmt.Errorf("cert_file cannot be empty when using HTTPS")
}
if keyfile == "" {
return fmt.Errorf("cert_key cannot be empty when using HTTPS")
}
if _, err := os.Stat(setting.CertFile); os.IsNotExist(err) {
return fmt.Errorf(`Cannot find SSL cert_file at %v`, setting.CertFile)
}
if _, err := os.Stat(setting.KeyFile); os.IsNotExist(err) {
return fmt.Errorf(`Cannot find SSL key_file at %v`, setting.KeyFile)
}
return http.ListenAndServeTLS(listenAddr, setting.CertFile, setting.KeyFile, m)
}
// implement context.Context // implement context.Context
func (g *GrafanaServerImpl) Deadline() (deadline time.Time, ok bool) { func (g *GrafanaServerImpl) Deadline() (deadline time.Time, ok bool) {
return g.context.Deadline() return g.context.Deadline()