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

xorm engine.SetMaxConns is a deprecated alias for engine.SetMaxOpenConns

Browse Source
This commit is contained in:
Dan Cech
2017-03-27 18:04:03 -04:00
parent 09ec8cdebe
commit dde8583db8
3 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
conf/defaults.ini
View File

@@ -74,7 +74,6 @@ password =
url = url =
# Max conn setting default is 0 (mean not set) # Max conn setting default is 0 (mean not set)
max_conn =
max_idle_conn = max_idle_conn =
max_open_conn = max_open_conn =

1
conf/sample.ini
View File

@@ -83,7 +83,6 @@
;path = grafana.db ;path = grafana.db
# Max conn setting default is 0 (mean not set) # Max conn setting default is 0 (mean not set)
;max_conn =
;max_idle_conn = ;max_idle_conn =
;max_open_conn = ;max_open_conn =

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

@@ -29,7 +29,6 @@ type DatabaseConfig struct {
ClientKeyPath string ClientKeyPath string
ClientCertPath string ClientCertPath string
ServerCertName string ServerCertName string
MaxConn int
MaxOpenConn int MaxOpenConn int
MaxIdleConn int MaxIdleConn int
} }
@@ -157,7 +156,6 @@ func getEngine() (*xorm.Engine, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} else { } else {
engine.SetMaxConns(DbCfg.MaxConn)
engine.SetMaxOpenConns(DbCfg.MaxOpenConn) engine.SetMaxOpenConns(DbCfg.MaxOpenConn)
engine.SetMaxIdleConns(DbCfg.MaxIdleConn) engine.SetMaxIdleConns(DbCfg.MaxIdleConn)
// engine.SetLogger(NewXormLogger(log.LvlInfo, log.New("sqlstore.xorm"))) // engine.SetLogger(NewXormLogger(log.LvlInfo, log.New("sqlstore.xorm")))
@@ -191,7 +189,6 @@ func LoadConfig() {
DbCfg.Host = sec.Key("host").String() DbCfg.Host = sec.Key("host").String()
DbCfg.Name = sec.Key("name").String() DbCfg.Name = sec.Key("name").String()
DbCfg.User = sec.Key("user").String() DbCfg.User = sec.Key("user").String()
DbCfg.MaxConn = sec.Key("max_conn").MustInt(0)
DbCfg.MaxOpenConn = sec.Key("max_open_conn").MustInt(0) DbCfg.MaxOpenConn = sec.Key("max_open_conn").MustInt(0)
DbCfg.MaxIdleConn = sec.Key("max_idle_conn").MustInt(0) DbCfg.MaxIdleConn = sec.Key("max_idle_conn").MustInt(0)
if len(DbCfg.Pwd) == 0 { if len(DbCfg.Pwd) == 0 {