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

datasource as cfg: improve name for this feature

Browse Source
This commit is contained in:
bergquist
2017-10-22 23:05:17 +02:00
parent ba4bbd1d47
commit c9bfa781fd
3 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ import (
"github.com/grafana/grafana/pkg/services/search"
"github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/setting"
dsSettings "github.com/grafana/grafana/pkg/setting/datasources"
datasourcesFromConfig "github.com/grafana/grafana/pkg/setting/datasources"
"github.com/grafana/grafana/pkg/social"
"github.com/grafana/grafana/pkg/tracing"
)
@@ -56,9 +56,9 @@ func (g *GrafanaServerImpl) Start() {
g.writePIDFile()
initSql()
err := dsSettings.Init(filepath.Join(setting.HomePath, "conf/datasources.yaml"))
err := datasourcesFromConfig.Apply(filepath.Join(setting.HomePath, "conf/datasources.yaml"))
if err != nil {
g.log.Error("Failed to load datasources from config", "error", err)
g.log.Error("Failed to configure datasources from config", "error", err)
g.Shutdown(1, "Startup failed")
return
}