fix database connection issues

Author: JesusGuzmanJr

README.md

@@ -20,8 +20,8 @@ Rust earned the top spot as the “most-loved” programming language for the fi
 | ------------------ | ------------------------------------------------------ | -------------------------------------------- |
 | domain name        | java-car-rentals.marzipan.club                         | rust-car-rentals.marzipan.club               |
 | health endpoint    | https://java-car-rentals.marzipan.club/health          | https://rust-car-rental.marzipan.club/health |
-| language           | [Java SE 8] ([OpenJDK 8 8u292-b10])                    | [Rust 2018] ([1.53.0])                       |
-| compiler           | java-1.8.0-openjdk-devel                               | rustc 1.53.0 (53cb7b09b 2021-06-17)          |
+| language           | [Java SE 8] ([OpenJDK 8 8u292-b10])                    | [Rust 2018] ([1.54.0])                       |
+| compiler           | java-1.8.0-openjdk-devel                               | rustc 1.54.0 (a178d0322 2021-07-26)          |
 | compilation target | java bytecode 52.0                                     | x86_64-unknown-linux-musl                    |
 | runtime            | [OpenJDK] ([java-1.8.0-openjdk])                       | [Tokio] ([0.2.25])                           |
 | web framework      | [Apache Tomcat] ([8.5.69]) and [Spring Boot] ([2.5.2]) | [Actix Web] ([3.3.2])                        |

java/src/main/resources/application.properties

@@ -1,6 +1,21 @@
+# logging
+logging.level=INFO
+logging.level.club.marzipan.javacarrentals=TRACE
+
+# http
 server.address=localhost
 server.port=8080
+server.tomcat.max-http-form-post-size=4KB
+server.shutdown=graceful
+spring.lifecycle.timeout-per-shutdown-phase=3s
+
+# database
+spring.datasource.url=jdbc:postgresql://hattie.db.elephantsql.com:5432/emmfovaj?stringtype=unspecified&sslmode=require&user=emmfovaj&password=XVnuN0br7UusH_El55gxWHEnkxZ-ZFfq
+spring.datasource.hikari.maximumPoolSize=2
+spring.datasource.hikari.minimumIdle=2
+spring.datasource.hikari.maxLifetime=600
+spring.datasource.hikari.idleTimeout=3000
+spring.datasource.data-source-class-name=org.postgresql.ds.PGSimpleDataSource
+
+# miscellaneous
 management.info.git.mode=full
-spring.datasource.driver-class-name=org.postgresql.Driver
-spring.datasource.url=jdbc:postgresql://localhost:5432/car_rentals?stringtype=unspecified
-logging.level.org.springframework=OFF

rust/Cargo.lock

@@ -1,10 +1,18 @@
 (
+    // logging
+    logging_directive: "info,rust-car-service=trace",
+
+    // http
     address: "localhost",
     port: 9090,
-    logging_directive: "info,rust-car-service=trace,actix_web=debug",
-    graceful_shutdown_timeout_sec: 3,
     max_payload_size_bytes: 4096,
-    postgres_connection_pool_size: 1,
-    postgres_connection_timeout_sec: 1,
-    postgres_connection_uri: "postgres://localhost:5432/car_rentals",
+    graceful_shutdown_timeout_sec: 3,
+
+    // database
+    postgres_uri: "postgres://hattie.db.elephantsql.com/emmfovaj?sslmode=require&user=emmfovaj&password=XVnuN0br7UusH_El55gxWHEnkxZ-ZFfq",
+    postgres_max_pool_size: 2,
+    postgres_min_pool_size: 2,
+    postgres_max_life_time_minutes: 10,
+    postgres_timeout_sec: 3,
+
 )

rust/config.ron

@@ -9,31 +9,37 @@ static CONFIG: OnceCell<Config> = OnceCell::new();
 
 #[derive(Deserialize)]
 pub struct Config {
+    /// Enable custom logging; acceptable directive must follow the following
+    /// form https://docs.rs/env_logger/0.8.3/env_logger/index.html#enabling-logging.
+    pub logging_directive: String,
+
     /// The IPv4 address to listen to.
     pub address: String,
 
     /// The tcp port to bind to.
     pub port: u16,
 
-    /// Enable custom logging; acceptable directive must follow the following
-    /// form https://docs.rs/env_logger/0.8.3/env_logger/index.html#enabling-logging.
-    pub logging_directive: String,
+    /// The maximum size of an acceptable http request payload before responding
+    /// with an error.
+    pub max_payload_size_bytes: usize,
 
     /// The number of seconds for workers to shutdown gracefully.
     pub graceful_shutdown_timeout_sec: u64,
 
-    /// The maximum size of an acceptable http request payload before responding
-    /// with an error.
-    pub max_payload_size_bytes: usize,
+    /// The Postgres connection uri.
+    pub postgres_uri: String,
 
     /// The maximum number of active postgres connections to pool.
-    pub postgres_connection_pool_size: u32,
+    pub postgres_max_pool_size: u32,
 
-    /// The postgres connection timeout in seconds.
-    pub postgres_connection_timeout_sec: u64,
+    /// The minimum number of active postgres connections to maintain in the pool.
+    pub postgres_min_pool_size: u32,
 
-    /// The Postgres connection uri.
-    pub postgres_connection_uri: String,
+    // The maximum lifetime of a connection.
+    pub postgres_max_life_time_minutes: u64,
+
+    /// The Postgres connection timeout in seconds.
+    pub postgres_timeout_sec: u64,
 }
 
 fn init() -> Config {

rust/src/config.rs

@@ -6,28 +6,24 @@ static POOL: OnceCell<Pool> = OnceCell::new();
 
 pub async fn init() {
     let config = crate::config::app_config();
-    let pool_size = config.postgres_connection_pool_size;
 
-    let connection_timeout = std::time::Duration::new(config.postgres_connection_timeout_sec, 0);
+    let connection_timeout = std::time::Duration::new(config.postgres_timeout_sec, 0);
+    let max_lifetime = std::time::Duration::new(config.postgres_max_life_time_minutes * 60, 0);
 
     // panic if connection pool can't be created
     let pool = sqlx::postgres::PgPoolOptions::new()
-        .max_connections(pool_size)
+        .max_connections(config.postgres_max_pool_size)
+        .min_connections(config.postgres_min_pool_size)
         .connect_timeout(connection_timeout)
-        .connect(&config.postgres_connection_uri)
+        .max_lifetime(max_lifetime)
+        .connect(&config.postgres_uri)
         .await
         .expect("Couldn't create postgres connection pool.");
 
     pool.acquire().await.expect("Couldn't connect to postgres.");
 
     POOL.set(pool)
         .expect("Postgres connection pool is already initialized.");
-
-    log::info!(
-        "Started {} connection{} to Postgres.",
-        pool_size,
-        if pool_size == 1 { "" } else { "s" }
-    );
 }
 
 /// Returns a reference to the database connection pool.