tapd: allow configuring all connection params for Postgres

We want to be able to specify the number of idle connections, and other lifetime parameters for Postgres as well.
lightninglabs · Oct 24, 2023 · e731dd4 · e731dd4
1 parent d9a8efd
commit e731dd4
Showing 1 changed file with 36 additions and 10 deletions.
diff --git a/tapdb/postgres.go b/tapdb/postgres.go
@@ -14,6 +14,13 @@ import (
 
 const (
 	dsnTemplate = "postgres://%v:%v@%v:%d/%v?sslmode=%v"
+
+	// defaultMaxIdleConns is the number of permitted idle connections.
+	defaultMaxIdleConns = 6
+
+	// defaultConnMaxIdleTime is the amount of time a connection can be
+	// idle before it is closed.
+	defaultConnMaxIdleTime = 5 * time.Minute
 )
 
 var (
@@ -27,14 +34,17 @@ var (
 
 // PostgresConfig holds the postgres database configuration.
 type PostgresConfig struct {
-	SkipMigrations     bool   `long:"skipmigrations" description:"Skip applying migrations on startup."`
-	Host               string `long:"host" description:"Database server hostname."`
-	Port               int    `long:"port" description:"Database server port."`
-	User               string `long:"user" description:"Database user."`
-	Password           string `long:"password" description:"Database user's password."`
-	DBName             string `long:"dbname" description:"Database name to use."`
-	MaxOpenConnections int    `long:"maxconnections" description:"Max open connections to keep alive to the database server."`
-	RequireSSL         bool   `long:"requiressl" description:"Whether to require using SSL (mode: require) when connecting to the server."`
+	SkipMigrations     bool          `long:"skipmigrations" description:"Skip applying migrations on startup."`
+	Host               string        `long:"host" description:"Database server hostname."`
+	Port               int           `long:"port" description:"Database server port."`
+	User               string        `long:"user" description:"Database user."`
+	Password           string        `long:"password" description:"Database user's password."`
+	DBName             string        `long:"dbname" description:"Database name to use."`
+	MaxOpenConnections int           `long:"maxconnections" description:"Max open connections to keep alive to the database server."`
+	MaxIdleConnections int           `long:"maxidleconnections" description:"Max number of idle connections to keep in the connection pool."`
+	ConnMaxLifetime    time.Duration `long:"connmaxlifetime" description:"Max amount of time a connection can be reused for before it is closed."`
+	ConnMaxIdleTime    time.Duration `long:"connmaxidletime" description:"Max amount of time a connection can be idle for before it is closed."`
+	RequireSSL         bool          `long:"requiressl" description:"Whether to require using SSL (mode: require) when connecting to the server."`
 }
 
 // DSN returns the dns to connect to the database.
@@ -77,9 +87,25 @@ func NewPostgresStore(cfg *PostgresConfig) (*PostgresStore, error) {
 		maxConns = cfg.MaxOpenConnections
 	}
 
+	maxIdleConns := defaultMaxIdleConns
+	if cfg.MaxIdleConnections > 0 {
+		maxIdleConns = cfg.MaxIdleConnections
+	}
+
+	connMaxLifetime := defaultConnMaxLifetime
+	if cfg.ConnMaxLifetime > 0 {
+		connMaxLifetime = cfg.ConnMaxLifetime
+	}
+
+	connMaxIdleTime := defaultConnMaxIdleTime
+	if cfg.ConnMaxIdleTime > 0 {
+		connMaxIdleTime = cfg.ConnMaxIdleTime
+	}
+
 	rawDb.SetMaxOpenConns(maxConns)
-	rawDb.SetMaxIdleConns(maxConns)
-	rawDb.SetConnMaxLifetime(defaultConnMaxLifetime)
+	rawDb.SetMaxIdleConns(maxIdleConns)
+	rawDb.SetConnMaxLifetime(connMaxLifetime)
+	rawDb.SetConnMaxIdleTime(connMaxIdleTime)
 
 	if !cfg.SkipMigrations {
 		// Now that the database is open, populate the database with