Merge pull request #5 from busgo/dev

Dev
busgo · Jan 11, 2022 · eb8b82e · eb8b82e
2 parents 5f1b0a9 + 06ed0c8
commit eb8b82e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/app.yaml b/app.yaml
@@ -11,6 +11,8 @@ etcd:
 
 mysql:
   dsn: root:123456@tcp(localhost:3306)/pink
+  maxOpenConns: 20
+  maxIdleConns: 10
 
 log:
   fileName: pink.log

diff --git a/conf/app.go b/conf/app.go
@@ -14,7 +14,9 @@ type AppConf struct {
 		DialTimeout int64
 	}
 	Mysql struct {
-		DSN string
+		DSN          string
+		MaxOpenConns int
+		MaxIdleConns int
 	}
 	Log struct {
 		FileName    string

diff --git a/db/db.go b/db/db.go
@@ -19,7 +19,11 @@ func NewDB(app *conf.AppConf) *DB {
 		panic(err)
 	}
 
-	db.SetMaxOpenConns(20)
-	db.SetMaxIdleConns(10)
+	if err = db.Ping(); err != nil {
+		panic(err)
+	}
+
+	db.SetMaxOpenConns(app.Mysql.MaxOpenConns)
+	db.SetMaxIdleConns(app.Mysql.MaxIdleConns)
 	return &DB{DS: db}
 }
diff --git a/db/repository/execute_snapshot_his_repository.go b/db/repository/execute_snapshot_his_repository.go
@@ -105,6 +105,7 @@ func (repo *ExecuteSnapshotHisRepository) SearchExecuteSnapshotHisByPage(request
 	if err != nil {
 		return make([]*model.ExecuteSnapshotHis, 0), err
 	}
+	defer rows.Close()
 
 	records := make([]*model.ExecuteSnapshotHis, 0)
 
@@ -167,6 +168,8 @@ func (repo *ExecuteSnapshotHisRepository) SearchExecuteSnapshotHisByCount(reques
 		return 0, err
 	}
 
+	defer rows.Close()
+
 	count := int64(0)
 	if rows.Next() {
 		err = rows.Scan(&count)