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

Merge branch 'master' into feature/add_es_alerting

Browse Source
This commit is contained in:
Penghan Wang
2018-03-26 19:51:03 +08:00
committed by GitHub
parent 63a200686e fa72c4fea4
commit a21afbe9a6
196 changed files with 12469 additions and 4342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,7 @@ type GrafanaServerImpl struct {
childRoutines *errgroup.Group
log log.Logger
httpServer *api.HttpServer
httpServer *api.HTTPServer
}
func (g *GrafanaServerImpl) Start() error {
@@ -120,7 +120,7 @@ func (g *GrafanaServerImpl) initLogging() {
}
func (g *GrafanaServerImpl) startHttpServer() error {
g.httpServer = api.NewHttpServer()
g.httpServer = api.NewHTTPServer()
err := g.httpServer.Start(g.context)