From 24c7a632f2d66746b6bf6df288ec13eb0d0e3353 Mon Sep 17 00:00:00 2001
From: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
Date: Tue, 28 Feb 2023 15:15:15 +0800
Subject: [PATCH] fix(db): fix `SetMaxOpenConns` (#328)

---
 bridge/config.json        | 4 +++-
 common/version/version.go | 2 +-
 coordinator/config.json   | 4 +++-
 database/config.go        | 4 ++--
 database/config.json      | 4 +++-
 database/orm_factory.go   | 2 +-
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/bridge/config.json b/bridge/config.json
index 7abcfd51a..656e77ade 100644
--- a/bridge/config.json
+++ b/bridge/config.json
@@ -82,6 +82,8 @@
   },
   "db_config": {
     "driver_name": "postgres",
-    "dsn": "postgres://admin:123456@localhost/test?sslmode=disable"
+    "dsn": "postgres://admin:123456@localhost/test?sslmode=disable",
+    "maxOpenNum": 200,
+    "maxIdleNum": 20
   }
 }
diff --git a/common/version/version.go b/common/version/version.go
index 08c7b9bf7..610741983 100644
--- a/common/version/version.go
+++ b/common/version/version.go
@@ -5,7 +5,7 @@ import (
 	"runtime/debug"
 )
 
-var tag = "alpha-v1.10"
+var tag = "alpha-v1.11"
 
 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {
diff --git a/coordinator/config.json b/coordinator/config.json
index c40f09d6f..b95ddcf9b 100644
--- a/coordinator/config.json
+++ b/coordinator/config.json
@@ -12,7 +12,9 @@
   },
   "db_config": {
     "driver_name": "postgres",
-    "dsn": "postgres://admin:123456@localhost/test?sslmode=disable"
+    "dsn": "postgres://admin:123456@localhost/test?sslmode=disable",
+    "maxOpenNum": 200,
+    "maxIdleNum": 20
   },
   "l2_config": {
     "endpoint": "/var/lib/jenkins/workspace/SequencerPipeline/MyPrivateNetwork/geth.ipc"
diff --git a/database/config.go b/database/config.go
index 5b414528e..4c037946c 100644
--- a/database/config.go
+++ b/database/config.go
@@ -12,8 +12,8 @@ type DBConfig struct {
 	DSN        string `json:"dsn"`
 	DriverName string `json:"driver_name"`
 
-	MaxOpenNum int `json:"maxOpenNum" default:"200"`
-	MaxIdleNum int `json:"maxIdleNum" default:"20"`
+	MaxOpenNum int `json:"maxOpenNum"`
+	MaxIdleNum int `json:"maxIdleNum"`
 }
 
 // NewConfig returns a new instance of Config.
diff --git a/database/config.json b/database/config.json
index 6c65cf53c..eda41de4c 100644
--- a/database/config.json
+++ b/database/config.json
@@ -1,4 +1,6 @@
 {
   "dsn": "postgres://postgres:123456@localhost:5444/test?sslmode=disable",
-  "driver_name": "postgres"
+  "driver_name": "postgres",
+  "maxOpenNum": 200,
+  "maxIdleNum": 20
 }
\ No newline at end of file
diff --git a/database/orm_factory.go b/database/orm_factory.go
index d4f827a2c..df1de0707 100644
--- a/database/orm_factory.go
+++ b/database/orm_factory.go
@@ -38,7 +38,7 @@ func NewOrmFactory(cfg *DBConfig) (OrmFactory, error) {
 		return nil, err
 	}
 
-	db.SetMaxIdleConns(cfg.MaxOpenNum)
+	db.SetMaxOpenConns(cfg.MaxOpenNum)
 	db.SetMaxIdleConns(cfg.MaxIdleNum)
 	if err = db.Ping(); err != nil {
 		return nil, err