feat: #1042 Allow configure db ConnMaxLifetime & ConnMaxIdleTime

bridge-history-api/conf/config.json

@@ -43,7 +43,9 @@
 		"dsn": "postgres://postgres:123456@localhost:5444/test?sslmode=disable",
 		"driverName": "postgres",
 		"maxOpenNum": 200,
-		"maxIdleNum": 20
+		"maxIdleNum": 20,
+		"maxLifetime": 600,
+		"maxIdleTime": 300
 	},
 	"redis": {
 		"address": "localhost:6379",

common/database/config.go

@@ -8,4 +8,6 @@ type Config struct {
 
 	MaxOpenNum int `json:"maxOpenNum"`
 	MaxIdleNum int `json:"maxIdleNum"`
+	MaxLifetime int `json:"maxLifetime,omitempty"`
+	MaxIdleTime int `json:"maxIdleTime,omitempty"`
 }

common/database/db.go

@@ -15,6 +15,11 @@ import (
 	cutils "scroll-tech/common/utils"
 )
 
+const (
+	defaultConnMaxLifetime = time.Minute * 10
+	defaultConnMaxIdleTime = time.Minute * 5
+)
+
 type gormLogger struct {
 	gethLogger log.Logger
 }
@@ -70,8 +75,17 @@ func InitDB(config *Config) (*gorm.DB, error) {
 		return nil, pingErr
 	}
 
-	sqlDB.SetConnMaxLifetime(time.Minute * 10)
-	sqlDB.SetConnMaxIdleTime(time.Minute * 5)
+	if (config.MaxLifetime != 0) {
+		sqlDB.SetConnMaxLifetime(time.Second * time.Duration(config.MaxLifetime))
+	} else {
+		sqlDB.SetConnMaxLifetime(defaultConnMaxLifetime)
+	}
+
+	if (config.MaxIdleTime != 0) {
+		sqlDB.SetConnMaxIdleTime(time.Second * time.Duration(config.MaxIdleTime))
+	} else {
+		sqlDB.SetConnMaxIdleTime(defaultConnMaxIdleTime)
+	}
 
 	sqlDB.SetMaxOpenConns(config.MaxOpenNum)
 	sqlDB.SetMaxIdleConns(config.MaxIdleNum)

coordinator/conf/config.json

@@ -17,7 +17,9 @@
     "driver_name": "postgres",
     "dsn": "postgres://localhost/scroll?sslmode=disable",
     "maxOpenNum": 200,
-    "maxIdleNum": 20
+    "maxIdleNum": 20,
+    "maxLifetime": 600,
+    "maxIdleTime": 300
   },
   "l2": {
     "chain_id": 111

coordinator/internal/config/config_test.go

@@ -29,7 +29,9 @@ func TestConfig(t *testing.T) {
 			"driver_name": "postgres",
 			"dsn": "postgres://admin:123456@localhost/test?sslmode=disable",
 			"maxOpenNum": 200,
-			"maxIdleNum": 20
+			"maxIdleNum": 20,
+			"maxLifetime": 600,
+			"maxIdleTime": 300
 		},
 		"l2": {
 			"chain_id": 111

database/config.go

@@ -12,8 +12,10 @@ type DBConfig struct {
 	DSN        string `json:"dsn"`
 	DriverName string `json:"driver_name"`
 
-	MaxOpenNum int `json:"maxOpenNum"`
-	MaxIdleNum int `json:"maxIdleNum"`
+	MaxOpenNum  int `json:"maxOpenNum"`
+	MaxIdleNum  int `json:"maxIdleNum"`
+	MaxLifetime int `json:"maxLifetime,omitempty"`
+	MaxIdleTime int `json:"maxIdleTime,omitempty"`
 }
 
 // NewConfig returns a new instance of Config.

database/config.json

@@ -2,5 +2,7 @@
   "dsn": "postgres://postgres:123456@localhost:5444/test?sslmode=disable",
   "driver_name": "postgres",
   "maxOpenNum": 200,
-  "maxIdleNum": 20
+  "maxIdleNum": 20,
+  "maxLifetime": 600,
+  "maxIdleTime": 300
 }

database/config_test.go

@@ -15,7 +15,9 @@ func TestConfig(t *testing.T) {
 		"dsn": "postgres://postgres:123456@localhost:5444/test?sslmode=disable",
 		"driver_name": "postgres",
 		"maxOpenNum": %d,
-		"maxIdleNum": %d
+		"maxIdleNum": %d,
+		"maxLifetime": %d,
+		"maxIdleTime": %d
 	}`
 
 	t.Run("Success Case", func(t *testing.T) {

rollup/conf/config.json

@@ -82,6 +82,8 @@
     "driver_name": "postgres",
     "dsn": "postgres://localhost/scroll?sslmode=disable",
     "maxOpenNum": 200,
-    "maxIdleNum": 20
+    "maxIdleNum": 20,
+    "maxLifetime": 600,
+    "maxIdleTime": 300
   }
 }