From b3c51e6eb55c58adc024ee32b59c3910b2b72131 Mon Sep 17 00:00:00 2001
From: akshay-97 <adiosphobian@gmail.com>
Date: Tue, 28 Nov 2023 18:58:46 +0530
Subject: [PATCH] refactor: Added min idle and max lifetime for database config
 (#2900)

Co-authored-by: akshay.s <akshay.s@juspay.in>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Gnanasundari24 <118818938+Gnanasundari24@users.noreply.github.com>
Co-authored-by: hyperswitch-bot[bot] <148525504+hyperswitch-bot[bot]@users.noreply.github.com>
---
 config/development.toml                   | 1 +
 crates/router/src/configs/defaults.rs     | 2 ++
 crates/router/src/configs/kms.rs          | 2 ++
 crates/router/src/configs/settings.rs     | 4 ++++
 crates/storage_impl/src/config.rs         | 2 ++
 crates/storage_impl/src/database/store.rs | 4 +++-
 6 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/config/development.toml b/config/development.toml
index 3d64a8791a..bcf561dd58 100644
--- a/config/development.toml
+++ b/config/development.toml
@@ -20,6 +20,7 @@ port = 5432
 dbname = "hyperswitch_db"
 pool_size = 5
 connection_timeout = 10
+min_idle = 2
 
 [replica_database]
 username = "db_user"
diff --git a/crates/router/src/configs/defaults.rs b/crates/router/src/configs/defaults.rs
index 2eddaf3084..a92e63d676 100644
--- a/crates/router/src/configs/defaults.rs
+++ b/crates/router/src/configs/defaults.rs
@@ -30,6 +30,8 @@ impl Default for super::settings::Database {
             pool_size: 5,
             connection_timeout: 10,
             queue_strategy: Default::default(),
+            min_idle: None,
+            max_lifetime: None,
         }
     }
 }
diff --git a/crates/router/src/configs/kms.rs b/crates/router/src/configs/kms.rs
index 205169fa29..c2f159d16c 100644
--- a/crates/router/src/configs/kms.rs
+++ b/crates/router/src/configs/kms.rs
@@ -64,6 +64,8 @@ impl KmsDecrypt for settings::Database {
             pool_size: self.pool_size,
             connection_timeout: self.connection_timeout,
             queue_strategy: self.queue_strategy.into(),
+            min_idle: self.min_idle,
+            max_lifetime: self.max_lifetime,
         })
     }
 }
diff --git a/crates/router/src/configs/settings.rs b/crates/router/src/configs/settings.rs
index cc273f93ee..918ae6647e 100644
--- a/crates/router/src/configs/settings.rs
+++ b/crates/router/src/configs/settings.rs
@@ -517,6 +517,8 @@ pub struct Database {
     pub pool_size: u32,
     pub connection_timeout: u64,
     pub queue_strategy: QueueStrategy,
+    pub min_idle: Option<u32>,
+    pub max_lifetime: Option<u64>,
 }
 
 #[derive(Debug, Deserialize, Clone, Default)]
@@ -548,6 +550,8 @@ impl From<Database> for storage_impl::config::Database {
             pool_size: val.pool_size,
             connection_timeout: val.connection_timeout,
             queue_strategy: val.queue_strategy.into(),
+            min_idle: val.min_idle,
+            max_lifetime: val.max_lifetime,
         }
     }
 }
diff --git a/crates/storage_impl/src/config.rs b/crates/storage_impl/src/config.rs
index ceed3da81b..f53507831b 100644
--- a/crates/storage_impl/src/config.rs
+++ b/crates/storage_impl/src/config.rs
@@ -10,4 +10,6 @@ pub struct Database {
     pub pool_size: u32,
     pub connection_timeout: u64,
     pub queue_strategy: bb8::QueueStrategy,
+    pub min_idle: Option<u32>,
+    pub max_lifetime: Option<u64>,
 }
diff --git a/crates/storage_impl/src/database/store.rs b/crates/storage_impl/src/database/store.rs
index a09f1b7525..c36575e37c 100644
--- a/crates/storage_impl/src/database/store.rs
+++ b/crates/storage_impl/src/database/store.rs
@@ -88,8 +88,10 @@ pub async fn diesel_make_pg_pool(
     let manager = async_bb8_diesel::ConnectionManager::<PgConnection>::new(database_url);
     let mut pool = bb8::Pool::builder()
         .max_size(database.pool_size)
+        .min_idle(database.min_idle)
         .queue_strategy(database.queue_strategy)
-        .connection_timeout(std::time::Duration::from_secs(database.connection_timeout));
+        .connection_timeout(std::time::Duration::from_secs(database.connection_timeout))
+        .max_lifetime(database.max_lifetime.map(std::time::Duration::from_secs));
 
     if test_transaction {
         pool = pool.connection_customizer(Box::new(TestTransaction));