Merge pull request knadh#226 from mr-karan/fix/db-config

Fix/db config
runningnoodle · Nov 17, 2020 · d9ab365 · d9ab365
2 parents c60cc35 + ad8f290
commit d9ab365
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/cmd/queries.go b/cmd/queries.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"time"
 
 	"github.com/jmoiron/sqlx"
 	"github.com/lib/pq"
@@ -84,14 +85,15 @@ type Queries struct {
 
 // dbConf contains database config required for connecting to a DB.
 type dbConf struct {
-	Host     string `koanf:"host"`
-	Port     int    `koanf:"port"`
-	User     string `koanf:"user"`
-	Password string `koanf:"password"`
-	DBName   string `koanf:"database"`
-	SSLMode  string `koanf:"ssl_mode"`
-	MaxOpen  int    `koanf:"max_open"`
-	MaxIdle  int    `koanf:"max_idle"`
+	Host        string        `koanf:"host"`
+	Port        int           `koanf:"port"`
+	User        string        `koanf:"user"`
+	Password    string        `koanf:"password"`
+	DBName      string        `koanf:"database"`
+	SSLMode     string        `koanf:"ssl_mode"`
+	MaxOpen     int           `koanf:"max_open"`
+	MaxIdle     int           `koanf:"max_idle"`
+	MaxLifetime time.Duration `koanf:"max_lifetime"`
 }
 
 // connectDB initializes a database connection.
@@ -104,6 +106,7 @@ func connectDB(c dbConf) (*sqlx.DB, error) {
 	}
 	db.SetMaxOpenConns(c.MaxOpen)
 	db.SetMaxIdleConns(c.MaxIdle)
+	db.SetConnMaxLifetime(c.MaxLifetime)
 	return db, nil
 }
 

diff --git a/config-demo.toml b/config-demo.toml
@@ -10,3 +10,6 @@
     password = "listmonk"
     database = "listmonk"
     ssl_mode = "disable"
+    max_open = 25
+    max_idle = 25
+    max_lifetime = "300s"
diff --git a/config.toml.sample b/config.toml.sample
@@ -17,3 +17,6 @@
     password = "listmonk"
     database = "listmonk"
     ssl_mode = "disable"
+    max_open = 25
+    max_idle = 25
+    max_lifetime = "300s"