فهرست منبع

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

Dan Cech 8 سال پیش
والد
کامیت
dde8583db8
3فایلهای تغییر یافته به همراه0 افزوده شده و 5 حذف شده
  1. 0 1
      conf/defaults.ini
  2. 0 1
      conf/sample.ini
  3. 0 3
      pkg/services/sqlstore/sqlstore.go

+ 0 - 1
conf/defaults.ini

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

+ 0 - 1
conf/sample.ini

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

+ 0 - 3
pkg/services/sqlstore/sqlstore.go

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