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

Changed from goconfig to its new counter part go-ini

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-01-27 10:09:54 +01:00
parent 951ce0a102
commit 95305e7e11
6 changed files with 99 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/services/sqlstore/sqlstore.go
View File

@@ -136,18 +136,20 @@ func getEngine() (*xorm.Engine, error) {
}
func LoadConfig() {
DbCfg.Type = setting.Cfg.MustValue("database", "type")
sec := setting.Cfg.Section("database")
DbCfg.Type = sec.Key("type").String()
if DbCfg.Type == "sqlite3" {
UseSQLite3 = true
}
DbCfg.Host = setting.Cfg.MustValue("database", "host")
DbCfg.Name = setting.Cfg.MustValue("database", "name")
DbCfg.User = setting.Cfg.MustValue("database", "user")
DbCfg.Host = sec.Key("host").String()
DbCfg.Name = sec.Key("name").String()
DbCfg.User = sec.Key("user").String()
if len(DbCfg.Pwd) == 0 {
DbCfg.Pwd = setting.Cfg.MustValue("database", "password")
DbCfg.Pwd = sec.Key("password").String()
}
DbCfg.SslMode = setting.Cfg.MustValue("database", "ssl_mode")
DbCfg.Path = setting.Cfg.MustValue("database", "path", "data/grafana.db")
DbCfg.SslMode = sec.Key("ssl_mode").String()
DbCfg.Path = sec.Key("path").MustString("data/grafana.db")
}
type dbTransactionFunc func(sess *xorm.Session) error