From dde8583db80855f7ca625bf70ffa7938023dc76b Mon Sep 17 00:00:00 2001
From: Dan Cech <dcech@raintank.io>
Date: Mon, 27 Mar 2017 18:04:03 -0400
Subject: [PATCH] xorm engine.SetMaxConns is a deprecated alias for
 engine.SetMaxOpenConns

---
 conf/defaults.ini                 | 1 -
 conf/sample.ini                   | 1 -
 pkg/services/sqlstore/sqlstore.go | 3 ---
 3 files changed, 5 deletions(-)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 9f2c9ed6de3..490c2415e68 100644
--- a/conf/defaults.ini
+++ b/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 =
 
diff --git a/conf/sample.ini b/conf/sample.ini
index 3b7415e4217..3a61186f05e 100644
--- a/conf/sample.ini
+++ b/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 =
 
diff --git a/pkg/services/sqlstore/sqlstore.go b/pkg/services/sqlstore/sqlstore.go
index ef22dd9b6c6..d1f555d2d7f 100644
--- a/pkg/services/sqlstore/sqlstore.go
+++ b/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 {