new config option: database_connection_acquire_timeout_seconds

Author: lovasoa

configuration.md

@@ -12,6 +12,7 @@ on a [JSON](https://en.wikipedia.org/wiki/JSON) file placed in `sqlpage/sqlpage.
 | `database_connection_idle_timeout_seconds` | depends on the database      | Automatically close database connections after this period of inactivity |
 | `database_connection_max_lifetime_seconds` | depends on the database      | Always close database connections after this amount of time              |
 | `database_connection_retries`              | 6                            | Database connection attempts before giving up. Retries will happen every 5 seconds.           |
+| `database_connection_acquire_timeout_seconds` | 10                        | How long to wait when acquiring a database connection from the pool before giving up and returning an error.           |
 | `sqlite_extensions`                        |                              | An array of SQLite extensions to load, such as `mod_spatialite`          |
 
 You can find an example configuration file in [`sqlpage/sqlpage.json`](./sqlpage/sqlpage.json).

src/app_config.rs

@@ -27,14 +27,19 @@ pub struct AppConfig {
     /// will wait up to 30 seconds for the database to become available.
     #[serde(default = "default_database_connection_retries")]
     pub database_connection_retries: u32,
+
+    /// Maximum number of seconds to wait before giving up when acquiring a database connection from the
+    /// pool. The default is 10 seconds.
+    #[serde(default = "default_database_connection_acquire_timeout_seconds")]
+    pub database_connection_acquire_timeout_seconds: f64,
 }
 
 pub fn load() -> anyhow::Result<AppConfig> {
     let mut conf = Config::builder()
         .set_default("listen_on", "0.0.0.0:8080")?
         .add_source(config::File::with_name("sqlpage/sqlpage").required(false))
         .add_source(env_config())
-        .add_source(env_config().prefix("SQLPAGE_"))
+        .add_source(env_config().prefix("SQLPAGE"))
         .build()?
         .try_deserialize::<AppConfig>()
         .with_context(|| "Unable to load configuration")?;
@@ -93,6 +98,10 @@ fn default_database_connection_retries() -> u32 {
     6
 }
 
+fn default_database_connection_acquire_timeout_seconds() -> f64 {
+    10.
+}
+
 #[cfg(test)]
 pub(crate) mod tests {
     use super::AppConfig;

src/webserver/database/mod.rs

@@ -277,6 +277,9 @@ impl Database {
                         _ => Some(Duration::from_secs(60 * 60)),
                     }),
             )
+            .acquire_timeout(Duration::from_secs_f64(
+                config.database_connection_acquire_timeout_seconds,
+            ))
     }
 }